[cvsnt] Problem with Mergepoints

Harrison, Andrew andy.harrison at anite.com
Mon Feb 16 12:37:37 GMT 2004

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.


I'm having a problem with mergepoints. I'm not sure if it's something I'm
doing wrong, but CVS-NT isn't acting how I expected.

If I have two branches and create a new file on branch 1, and then merge
branch 1 into branch 2, then the new file is correctly created on branch 2.
Since the files was created after the branch was taken, there are two
different revisions of the file in the repository, one for each branch, but
they are identical. This is what I expected. However I would also expect the
revision in branch 2 to have a mergepoint in it saying it was merged from
the version in branch 1, but it doesn't. Is this the correct behaviour?
Because this mergepoint does not exist, the next time I try to merge branch
1 into branch 2 CVS attempts to merge the file again, even when no changes
have been mage in either branch. Since the null-delta patch this doesn't
actually create new a revision for text files, but it does create a conflict
in binary files.


Andy Harrison - Platform Software Engineer 
Anite Telecoms Ltd. 127 Fleet Road, Fleet, Hampshire, GU51 3QN, UK
"No matter how bad things seem... nothing could be worse than being used as
a towel rail." - A.A. Milne
Please note that my email domain has changed from @anitetelecoms.com to
Registered in England No. 1721900 Registered Office: 353 Buckingham Avenue,
Slough, Berkshire SL1 4PF, United Kingdom 

Scanned for viruses by MessageLabs. The integrity and security of this message cannot be guaranteed. This email is intended for the named recipient only, and may contain confidential information and proprietary material. Any unauthorised use or disclosure is prohibited.

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