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

[Arthur Barrett]

Serge,

Please read this page:
http://www.cvsnt.org/wiki/MergePoint

In short MergePoints automatically allow you to merge from the last
mergepoint to the tip - so they require only one -j option.

And you usually use update, not checkout.

Regards,


Arthur


-----Original Message-----
From: cvsnt-bounces at cvsnt.org [mailto:cvsnt-bounces at cvsnt.org] On Behalf
Of Serge
Sent: Saturday, 28 January 2006 6:38 AM
To: cvsnt at cvsnt.org
Subject: [cvsnt] Does cvsnt support mergepoints for *delta* merges?


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


_______________________________________________
cvsnt mailing list
cvsnt at cvsnt.org http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt