[cvsnt] Re: BUG when merging and removing files on branches

Harrison, Andrew andy.harrison at anite.com
Fri May 7 13:27:13 BST 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.

> From: Tony Hoyle [mailto:tmh at nodomain.org]
> I'm always open to persuasion... however I prefer to err on the side
> of  paranoia.
> Liked your diagram though...   That just about persuaded me it's doing
> the right thing :)

Would it be possible to scan back up the branch and distinguish between
actual edits and merges? If the only revisions in the branch were the result
of merges, then the file could be safely deleted. If there were any
revisions that were actual modification in the branch, then the result
should be a conflict. 

If scanning back up the branch is not possible, then the result should
always be a conflict. I think that leaving the file 'alive' but not marked
as a conflict is always incorrect.


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