[cvsnt] Merge doesn't remove file

Tony Hoyle tony.hoyle at march-hare.com
Thu Mar 13 16:03:23 GMT 2008

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.

Gerhard Fiedler wrote:
> Hello,
> I have a file that has been removed on a branch, but when I merge that 
> branch into HEAD, the file on HEAD doesn't get removed. Instead, I get a 
> message that says "cvs server: file Base.hpp has been modified, but has 
> been removed in revision bGeDev". (See the update command below.)
> The file is not modified on HEAD (see stat below). The only modifications 
> are a few revisions on the branch after the last merge before the file got 
> removed on the branch. But the last revision on the branch is dead (see log 
> below). Yet, after the merge, the file in HEAD is untouched.
> Can anybody explain why it doesn't merge the remove from the branch to 
The branch was branched from 1.4, and there's a 1.5 on HEAD, which means 
that to delete on the merge is a conflict - changes will be lost.  cvsnt 
won't do anything that could potentially lose edits, so it warns you so 
you can do any changes needed manually.


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