Strange conflicts as a result of merging a branch into the main t runk

[Jacob Burckhardt]

Jacob Burckhardt writes:
> Reinstein, Shlomo writes:
...
> > Since no work was done on the main trunk since the creation of the branch,
> > I'd expect CVS to just update the working directory with the newest version
> > of the branch. (which would be the result of merging all changes made in the
> > branch into the working directory.) However, the results were different.
> > During this merge, we encountered conflicts! Can you explain this?
...
> 
> That sounds like the same bug which Karl Tomlinson's patch fixes:
> 
> http://www.mail-archive.com/address@hidden/msg00554.html
> 
...
> I would like to know if your bug is the same bug that Karl fixed.  So
> please send me the files which you tried to merge and I will then test
> them on Karl's patch and I might want to include them in sanity.sh.
> 

Using the files you sent me, I reproduced the bug in the unpatched
cvs-1.11, and I also tested Karl's patch and his patch fixed it for
your test case.  Thank for sending me your files.