Re: control-center reorganization in CVS

[Martin Baulig <martin home-of-linux org>]

Sander Vesik <Sander Vesik Sun COM> writes:

> On 5 Jul 2001, Owen Taylor wrote:
> 
> > 
> > Not that it really helps, but in case this wasn't clear, the right
> > thing to do was not to create new-* directories in the first
> > place, but simply:
> > 
> >  a) Branch
> >  b) Change (remove and add files, etc.) the control-center/control-center
> >     directory in place.
> > 
> > Now, if you have a single branch in CVS with two different histories
> > for the same file, you are going to have to drastic measures
> > like creating a new module, or loose one of those histories,
> > but can we hope that this will never happen again?

Eeeek, who the hell was so stupid to do this ?

> ehhhh... I think making a new module just to "cover up" gross things
> having happened in cvs is not the way to go. IMHO we need to choose
> between:
> 	a) live with the new-* directories, usng cvs delete and repository
> 	   copying to create a consistent source there
> 	b) consolidate the sources to the old directory, using repository
> 	   copy for non-conflicting files and add a suffix (-new, 2,
> 	   whatever) for those that conflict and cvs delete anything that
> 	   isn't needed.

I'd vote for b).

-- 
Martin Baulig
martin gnome org (private)
baulig suse de (work)