[cvsnt] Does cvsnt support mergepoints for *delta* merges?

Serge sergenomail-cvsnt at yahoo.com
Fri Jan 27 19:38:22 GMT 2006


It looks like either I misunderstand cvsnt or a cvsnt has a bug.

Suppose we have a branch named branch and the base (the root of the
branch) is tagged as base_brunch.

Scenario 1 (works):

1.	cvs co -j branch module
2.	cvs commit -m "comment - Test for delivery script"
3.	cvs log produces:

revision 1.2
date: 2006/01/26 21:30:31;  author: xxxxx;  state: Exp;  lines: +2 -0; 
kopt: kv;  commitid: 43c43d93f760000;  mergepoint: 1.1.2.2;
comment - Test for delivery script

Here we can see the mergepoint.


Now scenario 2 (does not work):
1.	cvs co -j base_branch -j branch module
2.	cvs commit -m "comment - Test for delta delivery script"
3.	cvs log produces:

revision 1.3
date: 2006/01/26 21:30:31;  author: xxxxx;  state: Exp;  lines: +2 -0; 
kopt: kv;  commitid: 43c43d93f760000;
comment - Test for delta delivery script

No mergepoint whatsoever!

We really need these delta merges.
Can you help me, please?

Thanks!
Serge





More information about the cvsnt mailing list