Re: CVS and Arch co-development

On Thu, 26 Feb 2004 11:13:03 -0800, Kristian Kvilekval <[email protected]> 
wrote:
...
> Unfortunately, I think what has happened is that some
> changes where applied to my archive mdb--0.2 using
> star-merge, but the same ones are also being applied through
> the latest zinf--cvstrunk--1 (which got them through CVS).
> I am still fiddling, to get this worked out.

Ah, I think that may be my fault, updating the browsermm code to CVS.
Sorry :(

> What I would like to do is setup up a central zinf--cvstrunk--1
> that everybody can branch off of (branch from a branch also OK),
> but that all changes (from the arch world) go through cvstrunk--1
> That way, we can star-merge with each other and cvstrunk--1
> all we want.   Changes soley made in CVS will come
> back as patches from cvstrunk--1.
>
> I think this is the layout that will work (known branches)
>
> |CVS|   <=>  |cvstrunk--1|                       (CVS gateway)
>                   +  zinf--musicbrowsermm--0.3   (david's extensions)
>                   +  zinf--mdb--0.4              (kris's extensions)
>                   +  zinf--fixes--2.2.5          (2.2.5 bug fixes)
>                   +  zinf--releases--2.2         (tagged releases)
>                   +  zinf--rotty--0.1            (andreas's fixes)
>                   +  zinf--debian--2.2.5         (andreas's debian)
>
> (names are just suggestions)
>
> People that are using arch should commit to CVS only through
> trunk.   I think this will keep our patch sets clean and keep
> everything star-merge'able with a minimum of conflicts.
>
> Comments and suggestions?

Good idea, were you thinking of using arch-pqm for cvstrunk as has been 
suggested, or doing the merging/syncing with cvstrunk manually?

> I have also been playing around with cscvs and it seem  pretty
> cool, so it may make sense to recreate cvstrunk (at least
> partially) using that tool  before these branches are created.

Sounds fine, I'll wait before creating a new branch then. Just out 
interest, what advantage is there to recreating cvstrunk as compared to 
the one that you've created? Will it sort the history into a set of clean 
changesets, or something? Or will it just make using cscvs easier?

David
-- 
Using M2, Opera's revolutionary e-mail client: http://www.opera.com/m2/


-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click