Re: Maintaining branches...

[Eric Siegerman]

On Wed, Jun 13, 2001 at 11:12:16PM -0700, Paul Sander wrote:
> Is there some reason why the -j's could not be recorded in the CVS directory,
> and corrected with each update?  The joins shouldn't be recorded in the
> repository until the commits are done anyway.
> 
> -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.

When a file is in this merged-but-not-committed state, "rm foo;
cvs up foo" should do one of two things:
  - erase the "-j" notation, or
  - redo the merge(s)

Redoing the merge would basically make "-j" sticky -- but only a
little sticky, like a PostIt Note :-) -- since it should become
"unstuck" after a commit.

The former would preserve consistency with current behaviour; the
latter would bring this case more into line with the rest of CVS.
Which of these would be preferable?

--

|  | /\
|-_|/  >   Eric Siegerman, Toronto, Ont.        address@hidden
|  |  /
With sufficient thrust, pigs fly just fine. However, this is not
necessarily a good idea.
        - RFC 1925 (quoting an unnamed source)