[cvsnt] Re: Missing merge point on files which was initially added on branch

[Tony Hoyle]

Thomas Bergmann wrote:


> # merge to patch to main branch
> cvs update -A
> cvs update -d -j rel-1-0 -j rel-1-0-patches
> cvs -q commit -m "merge files" file1.txt file2.txt
> 
> # merge point on file2 is missing

There's not supposed to be one there, as it's a two -j merge.

> cvs -q update -r rel-2-0-patches
> cvs -q update -d -j rel-1-0 -j rel-1-0-patches
> 
Same there.

Tony