Re: Maintaining branches...

[Paul Sander]

>--- Forwarded mail from address@hidden

>Mike Castle wrote:

>> On Thu, Jun 14, 2001 at 12:57:30PM -0400, Greg A. Woods wrote:
>> > That's the trick.  How do you do that without impacting RCS 
>> > compatability???
>> > Is doing it as part of the commit message sufficient?
>>
>> This can already be accomplished with external scripts that make use of
>> magic values in commit messages.
>>
>> And even this, it only handles very special cases of merges.  That is, were
>> all changes on one branch are merged into another.

>Why?  There are other technical/usablity problems with this (maybe a nitpick
>since much of this data could still be made useful, but I think it would be 
>hard
>to make CVS aware that a user had deleted the merged data from a file 
>manually),
>but I don't see any reason why both tags couldn't be stored for any merge.

>Well, tags could be stored, but that would be useless...  individual file names
>and revisions describing each diff would be necessary since tags can be moved.

I don't see the need to include filenames in the notations, given that
joins can be done only within the contents of a single RCS file.  If CVS
is extended to allow merging across multiple version histories, then the
contributing RCS files must be recorded.  Note that this is a hard problem
in the event that multiple repositories are involved, because the value of
CVSROOT can also change over time.

>--- End of forwarded message from address@hidden