[cvsnt] Yet another obscure merge problem

Harrison, Andrew andy.harrison at anite.com
Tue Feb 24 11:23:57 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.


First of all let me say a big thanks for the merging fixes in 2.0.30, they
work great. 3 days between problem report to fix is a truly impressive
turnaround time. However... I think I've found another corner case. Sorry.
I'm not doing this on purpose, really I'm not!

Anyway, here's the details.

Main_Dev branch:
Several files, including file.c rev 1.1

New branch from Main_Dev: Branch1
Several files updated, but file.c unchanged. 

Several files updated, including file.c being deleted.

New branch from Main_Dev: Branch2

So, the current state of file.c is
Main_Dev: rev 1.2 (deleted)
Branch1: rev 1.1
Branch2: Doesn't exist

Now, if I merge Branch1 -> Branch2 then file.c gets recreated in Branch2. Is
this correct?

I know that explaining it like without all the other changes makes it seem
lie a really obscure thing to do, but this is a very cut down version of
what actually happened.


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