Re: [MP-d] Parallel branches for existing derivations

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

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

Hi all!

4 days ago Stefan Merten wrote:
...
> * Import your sources to your branch.
>=20
>   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.
>=20
>   I'll experiment a bit here and tell you about what I think is
>   useful.

I thought about it and noticed that `lcvs' needs a change (I said that
here already - right?). In the brand new version 1.5.5 I now added a
feature which allows import to a new vendor branch. I did not need
this before. Please download from

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

I played around with importing to various vendor branches and found we
need to have explicit branch revision numbers for the various vendor
branches. They must be given to the `-b' option.

At the moment we are expecting one branch for Comic so I suggest this
is

	1.1.2

while we expect at least one branch from Philips. So I suggest using

	1.1.3

(and upward) for the Philips vendor branches.

Ok. So now we have laid the foundations for the imports.

Now it is time to tell you something about the module system I
employed (and `lcvs' needs). The basic idea is that each package gets
an own (CVS) module name in the repository. I.e. it has an entry in
`CVSROOT/modules'. You don't need to care about creating this entry
because it is already there and `lcvs' is caring about it anyway.

The adavantage of these modules is that all packages are independent
from each other. You can check out one module and work with that
without needing the whole source tree for Multiplatform.

You may check which modules exist currently by

	lcvs -d AC...@cv...:/cvsroot/multiplatform checkout -c

The left column shows the module name while the right column shows the
location of the module in the CVS repository. You'll notice that the
module names are just the basenames of the respective directories. One
should not make things more complicated than necessary - but also not
less ;-) .

If you import your version of the sources you should do this on a
module by module basis. For example Peter may start with

	cd source/opt/base
	lcvs -d pp...@cv...:/cvsroot/multiplatform -m 'Imported =
from Comic.' -b 1.1.2 source/opt/base comic base

Again please double check that this does not introduce unwanted files
as I tried to explain in my last mail. If you are in doubt I am ready
to help in any thinkable way.

BTW: Once you get an checked out version of the sources you don't need
`-d AC...@cv...:/cvsroot/multiplatform' any more
because this is recorded in the local CVS administrative files then.

BTW: You don't need to worry about the module named `top'. I added
that to hold some files which should be in the top level directory of
the source tree.

Ok. I think this is it. Let's hope that Thomas gets his `ssh' through
to SourceForge. Please tell me of any progress.

Ah, one more thought. It is possible to employ means to get noticed
when the repository is changed. I did not employ anything yet. I'll
think about that.


						Gr=FC=DFe

						Stefan

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

iQCVAgUBP3BvZQnTZgC3zSk5AQFLZAQAgSuLiCJPR6AHkqlrW1ERBOgYzblP7tRA
VihyMdH4g5aACbzwCFH6A7fDd4fenfSrwREhhlyiOs5Kjm3R6ExkqjgATTxC45q7
7I9stCrOFSg9dkjoLUrxPbvYijl7FwBz64UWaT9lHXtVK37U98K3KyXqktjTQT+T
QUqsrVyLSjs=3D
=3Dvgcs
-----END PGP SIGNATURE-----