[MP-d] Parallel branches for existing derivations

[Stefan M. <me...@df...>]

-----BEGIN PGP SIGNED MESSAGE-----

Hi Thomas and Peter!

This mail tries to outline what I think is useful to integrate the
Multiplatform versions you are maintaining into the CVS source tree.

First of all get `lcvs' from

	http://www.merten-home.de/FreeSoftware/lcvs/

and put it in a directory in your path. `lcvs' works as a drop-in
replacement for the `cvs' command itself and calls `cvs' internally.
For CVS sub-commands reading the CVS tree it does nothing special but
for sub-commands writing to the CVS tree it adds some useful features.

To import your sources into the tree I think it is useful to `lcvs
import' them from an up-to-date snapshot of your source tree. For this
please.

* Check out the trunk by

	lcvs -d AC...@cv...:/cvsroot/multiplatform checkout -d t=
runk source

  This results in a directory `trunk' containing the source tree in
  the version it is on the trunk.

  You may also check out the `smartkom' branch to an own directory by

	lcvs -d AC...@cv...:/cvsroot/multiplatform checkout -d s=
martkom -r smartkom source

  You need `ssh' connection for that step. Please refer to the
  `sourceforge.net' documentation.

* Consider a branch name.

  I used `smartkom' as a branch name for the SmartKom specific branch.
  It's probably wise if Peter uses `comic' as a branch name. I don't
  know which branch name is wise for Thomas because I don't know of
  your details. The branch name may contain only lower case letters
  and - if need be - numbers.

* Structure your sources as can be found in the trunk or in the
  `smartkom' branch.

  Put all the source directories of all the packages in the well-known
  structure honoring the changes I made. In any case this includes to
  rename `lib/pools' to `lib/pca' and moving `opt/lib/something' to
  `opt/something'.

  Don't worry. I incorporated all changes necessary by this step into
  the trunk in some clean check ins so it should be not much of a
  problem to merge these changes into your branches.

  Perhaps it is wise to create a directory parallel to `trunk' (and
  `smartkom' if you have this) named as the branch. I.e. put your
  source tree under e.g. `comic'.

* Double-check that there are no superfluous files.

  *Please* make sure, that in your source tree there are no files
  which need not be there. Every file found in your source tree being
  not in at least the `smartkom' branch is questionable.

  The general rule is: Everything which can be generated does not
  belong into the source tree.

  At best report here which files you have which are not in the
  `smartkom' branch.

  You may employ

	diff -qr smartkom comic

  Any difference saying that there is a file in `comic' missing in
  `smartkom' needs special attention.

At this point one problem comes to mind. Before I checked in even the
`smartkom' branch I changed all source files by adding a copyright
notice containing the standard reference to the LGPL. This was a lot
of (unpleasant) work. However, it is necessary for the sources to
become Free.

Your sources should have these copyright notices as well. I think we
can think of a way how to merge them into your branches from the
`smartkom' branch or the trunk so you should not care too much about
this problem now.

* Import your sources to your branch.

  Ahm - I need to think about how to do that. This is a critical
  operation and it can make the repository quite ugly if done wrong.

  I'll experiment a bit here and tell you about what I think is
  useful.

If you have any questions or problems until here, feel free to ask on
this list.


						Gr=FC=DFe

						Stefan

-----BEGIN PGP SIGNATURE-----
Version: 2.6.2
Comment: Processed by Mailcrypt 3.4, an Emacs/PGP interface

iQCVAgUBP2sPbQnTZgC3zSk5AQFzRwP/TSji2cstBTwM8xlVGh6AZfXNzVowCQib
DK9x4sZwI//ei5ug0mkaUdfefxwrmQafh4Re/pQzwmHDRVIEmSNBhuAQWBS4uEN4
q4nEXW/ho2uPh9nr6+UAOIsH1zgW6cMP40OLtuGajnqA+u32nNvBh9Yh3pn7CZPE
/o3iM9xnYFY=3D
=3D2F6R
-----END PGP SIGNATURE-----