[cvsnt] Back-merging unchanged files

[Lars Christensen]

Hi,

If I merge change from HEAD to branch and then later want to merge other
changes from branch to HEAD, I get an empty revision for every file that
was merge to the BRANCH the first time. Even if I repeat and merge from
BRANCH again, I get another empty revision.

cvsnt doesn't seem to set mergepoint on these empty revisions.

It a bit problematic because it makes it alot harder to get an idea of
what files actually needed a merge. Is it really necessary?

The following commands

cvs tag -b branch
echo Hello Universe >> file.txt
cvs commit -m modified
cvs up -r branch
cvs up -j HEAD
cvs commit -m merge-to-branch
cvs up -A
cvs up -j branch
cvs commit -m merge-to-head
cvs up -j branch
cvs commit -m merge-to-head

Reveal this log, and a +0-0 revision for every merge-to-head:

RCS file: c:\tempcvsroot/module/file.txt,v
Working file: file.txt
head: 1.7
branch:
locks: strict
access list:
symbolic names:
        branch: 1.1.0.2
keyword substitution: kv
total revisions: 8;     selected revisions: 8
description:

<snip>

----------------------------
revision 1.4
date: 2005/01/20 09:13:07;  author: lac;  state: Exp;  lines: +0 -0;
kopt: kv;  commitid: 5a041ef76233822;  filename: file.txt;
merge-to-head
----------------------------
revision 1.3
date: 2005/01/20 09:13:06;  author: lac;  state: Exp;  lines: +0 -0;
kopt: kv;  commitid: 5a041ef7622381f;  filename: file.txt;
merge-to-head
----------------------------
revision 1.2
date: 2005/01/20 09:13:02;  author: lac;  state: Exp;  lines: +1 -0;
kopt: kv;  commitid: 5a041ef761e3812;  filename: file.txt;
modified
----------------------------
revision 1.1
date: 2005/01/20 09:13:01;  author: lac;  state: Exp;  kopt: kv;
commitid: 5a041ef761d380e;  filename: file.txt;
branches:  1.1.2;
created
----------------------------
revision 1.1.2.1
date: 2005/01/20 09:13:04;  author: lac;  state: Exp;  lines: +1 -0;
kopt: kv;  commitid: 46441ef76203818;  mergepoint: 1.2;  filename:
file.txt;
merge-to-branch
========================================================================
=====

Concurrent Versions System (CVSNT) 2.0.58d (client/server)


Thanks,
Lars