[cvsnt] Mergepoints

Erik Anderson erikba at teamworkgroup.com
Thu Nov 6 23:34:04 GMT 2003

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.

Sorry for asking such a newbie question, but documentation on this is not
obviously available to me.

What is a mergepoint, and how does one use it?

At this point I have been using branch tags to keep track of which changes
have been merged in and which ones haven't been, with commit descriptions
such as "Merged from merge_tag67 to merge_tag79 on BRANCH_V3_BUG134".  This
is so that I don't accidentally merge stuff that has already been done (and
get forced to re-resolve the conflicts involved), but it does create a large
number of obscure tags.  Does this mergepoints method improve this
situation?  Are mergepoints only available in CVSNT (not the mainstream CVS)

----- Original Message ----- 
From: "Tony Hoyle" <tmh at nodomain.org>
Newsgroups: support.cvsnt
To: <cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook>
Sent: Thursday, November 06, 2003 2:42 PM
Subject: RE: [cvsnt] Merging branch with identical versions still changes

> Storing a mergepoint takes a revision.  There is a patch in the 2.1 branch
> that avoids it where there's no changes (IIRC it skips the mergepoint
> there's nothing to merge) but it's not well tested (plus I'm getting less
> and less time to work on cvsnt these days.. I can't even get time look at
> bugs in the release branch at the moment).

More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook