Re: development on a branch

[Robert J. Clark]

On 31 Oct 2001 17:59:20 -0800
dale a schouten <address@hidden> wrote:

> If that was all I wanted to do, i.e. change the branch then get those changes
> back into the mainline, it's not too bad.  However, if I want to synch with
> the mainline, then the next time I do a synch or check it into the mainline
> then all the changes it got from the first synch seem to be treated as branch
> changes and it seems to get really confused and comes up with loads and loads
> of bogus conflicts.  Maybe I'm mis-analysing it, but the net effect is that I
> swore off trying to do anything but simple dead-end branches.

You do not show how you are doing the merges, but I am guessing that your 
problem is covered by:

    http://www.cvshome.org/docs/manual/cvs_5.html#SEC61

Specifically the section which mentions 

    "CVS will attempt to merge again the changes which you have already merged, 
     which can have undesirable side effects"

The solution to this is to tag the branch each time you merge it and
then later only merge the changes between the tag and the head. From the
example in the manual:

    cvs update -j LAST_MERGE_TO_MAIN -j BRANCH_NAME file.c

> Any input is appreciated, if you would like to contact me directly,
> you should be able to reach me at address@hidden

CC'd

- Rob