Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
Serge, OK - I understand your problem now I have a context. Mergepoints were not really designed for that specific scenario - it'd be up to yourself to add that support, or if enough people vote that that is a common requirement Tony may agree to put it on our list of development priorities (or may decide it's a bug not a feature). The lack of other people on this thread does not bode well... Otherwise what may help is understanding what we do. We assign a bug number to changes on branch B2 and merge the changes by bug number using cvs update -b bug instead. So when you are performing a specific bug fix on B2 do cvs edit -b bug and/or commit with bug number and then when you decide bug 1234 also needs porting to B1 just create a B1 sanbox/workspace and cvs update -b 1234 to "transfer" that bugfix. BTW check syntax before using my examples - the case of -B versus -b is significant and I'm really just typing pseudocode here... Regards, Arthur -----Original Message----- From: cvsnt-bounces at cvsnt.org on behalf of Serge Sent: Sat 1/28/2006 8:30 AM To: CVSNT CVSNT Cc: Subject: RE: [cvsnt] Does cvsnt support mergepoints for *delta* merges? Arthur, I agree about upgrade instead of co. Actually I tried both. But I need to merge delta only. With one -j I am getting all pre-history which I can not afford: Suppose we have b1 nad b2 branches. b1 is older then b2 and between branch points we have another changes on the trunk. Now I want to merge changes happened on the branch b2 to b1. I need to ignore trunk changes between b1 and b2. I can do this only with delta merge (two -j). Thanks! --- Arthur Barrett <arthur.barrett at march-hare.com> wrote: > 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 cvsnt downloads at march-hare.com https://www.march-hare.com/cvspro/en.asp#downcvs @CVSNT on Twitter CVSNT on Facebook > _______________________________________________ cvsnt mailing list cvsnt at cvsnt.org http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt