info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Maintaining branches...


From: Paul Sander
Subject: Re: Maintaining branches...
Date: Thu, 14 Jun 2001 16:00:47 -0700

>--- Forwarded mail from address@hidden

>[ On Wednesday, June 13, 2001 at 23:12:16 (-0700), Paul Sander wrote: ]
>> Subject: Re: Maintaining branches...
>>
>> Is there some reason why the -j's could not be recorded in the CVS directory,
>> and corrected with each update?

>That's an intersting idea.  It would certainly help me remember what I'm
>going in a given working directory, if nothing else!

>>  The joins shouldn't be recorded in the
>> repository until the commits are done anyway.

>That's true!

>> -j makes a notation in the CVS directory (or appends an existing one if
>> multiple joins are done between commits), and -r and -A clear out the
>> notations.  At commit time, the notations could be recorded in the RCS
>> files for future use.

>That's the trick.  How do you do that without impacting RCS compatability???
>Is doing it as part of the commit message sufficient?

RCS has a standard method for extending the content of the RCS files, called
the "newphrase".  (See the rcsfile(5) man page.)  These things have both
file-wide and version-wide scopes, and RCS ignores the ones it doesn't
recognize.  There should be no problem adding one or two newphrases to track
merges.

It might also be worthwhile to lobby the RCS developers (Paul Eggert?)
to add a command line argument to the ci program to set such a paramter,
and maybe also add arguments to the RCS program to add, query, and remove
newphrases.

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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]