[cvsnt] Re: Possible bug with mergepoints

[Gerhard Fiedler]

Bo Berglund wrote:

> So it looks indeed that if a file is added on a branch and committed,
> then the sandbox is updated to HEAD and then a update -j branch is
> done followed later by a regular update, then the mergepoint data for
> the file added on branch disappears and is not available when the
> final commit is done.
> But if the same sequence of edits updates and merge followed by update
> is done on a file that was added and then merged and committed
> directly then the initial mergepoint is preserved.

Thanks for the in-depth analysis :)

Is there a reason for the second update? Of course some files could have
been committed to on HEAD while you are doing the merging in your sandbox.
But you see them when you do the commit, and can update them individually
then. 

Gerhard