[cvsnt] Yet another obscure merge problem

Tony Hoyle tmh at nodomain.org
Fri Feb 27 12:08:35 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.

On Fri, 27 Feb 2004 10:17:03 -0000, "Harrison, Andrew"
<andy.harrison at anite.com> wrote:

>> From: Tony Hoyle [mailto:tmh at nodomain.org]
>> There are some default rules for nonexistant branches.  I suspect it 
>> just goes to the root of Branch1 - at which time the file existed... 
>> although it's not something I've done much research on.
>If I download the CVS source can you give me some pointers for where to
>start looking? I'd like to have a go at a patch, that would probably be more
>helpful than just sitting here moaning!
It's in update.c, in the join_file routine.  

Does the -f option to update change things?  It's one of those options
that normally doesn't seem to have a lot of point but might work in
your case.


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