[cvsnt] Re: Possible bug with mergepoints

[Bo Berglund]

On Sat, 19 Feb 2005 09:58:51 +0100, Bo Berglund
<bo.berglund at telia.com> 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.

Further info:
This is the contents of Entries.Extra after the merge update:

/AnotherBranchAddFile.txt///1108803207////
/BranchAddFile.txt///1108802178////
/ThirdBranchFile.txt/1.1.2.1//1108843469////

And this is the contents after the extra update:

/AnotherBranchAddFile.txt///1108803207////
/BranchAddFile.txt///1108802178////
/ThirdBranchFile.txt///////

As you can see the branch revision and mergepoint data disappear...


/Bo
(Bo Berglund, developer in Sweden)