[cvsnt] Re: Merging and Binaries

Gerhard Fiedler lists at connectionbrazil.com
Mon Jun 26 02:16:43 BST 2006

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.

Trevor Leybourne wrote:

> If I have my head branch and I add a binary file to HEAD (-kbx) and then
> create a branch, modify the file on the branch (along with some ascii
> files as well) and perform a merge, the Binary file will overwrite the
> revision in HEAD without giving any errors or conflicts 

Shouldn't this be interpreted as a conflict? After all, there are two
revisions that cvsnt can't merge -- which generally is considered a

> I then however cannot commit the file since I am not a valid editor of
> the file. 

Can you 'cvs edit' the file before it is committed? As a workaround, you
probably can at least 'cvs edit' it on the source branch...


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