[cvsnt] Merging and Binaries

[Arthur Barrett]

Trevor,

> If I have my head branch and I add a binary file to HEAD (-kbx) 

Check the recent Tortoise newsgroup postings regarding this.  Tortoise (incorrectly?) adds binary files as -kbx when the user has not specified "exclusive locking".  

CM best practice suggests that these things should be controlled separately rather than letting the client decide - which is why CVSNT has the "ignore client side -k options" server side setting.

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

This is the correct behaviour for exclusive locking - but I suspect you did not intend to use exclusive locking.

Binary files cannot be "automagically" merged by CVS/CVSNT.  So the "new" and "old" files are put in the sandbox so you can use a vendor supplied tool for performing the merge (eg: MS Word).

Regards,


Arthur Barrett