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

Tony Hoyle tmh at nodomain.org
Fri May 7 12:29:23 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.

On Fri, 7 May 2004 09:27:50 +0100, "Harrison, Andrew"
<andy.harrison at anite.com> wrote:

>with what you say should happen. The thing is, Tony doesn't, and he's in
>charge. I had quite a discussion with him previously about it and it
>basically comes down to how 'paranoid' you want the automatic merging to be.
>In this case and a few others, CVS-NT is slightly more paranoid than you and
>me and so does not delete the file but leave it for the user to sort out. 

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 :)


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