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, I agree that I think it should be seen as a conflict since it cannot merge, which was one of the points of my question. And yes, I can issue a CVS EDIT command and then commit the file (although not from TortoiseCVS as it will not give me that option -- I need to run cvs edit from the command line). We have our repository quite nicely setup so I can merge on a folder by folder basis rather than the whole sandbox and therefore only do the textual files rather than binary anyway, its just a bit more work. I had expected conflicts to occur when a Binary was attempted to merge and for me to select which file I would keep and then I can manually update the file or use a special tool for merging Oracle forms. Cheers Trevor -----Original Message----- From: cvsnt-bounces at cvsnt.org [mailto:cvsnt-bounces at cvsnt.org] On Behalf Of Gerhard Fiedler Sent: Monday, 26 June 2006 1:17 p.m. To: cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook Subject: [cvsnt] Re: Merging and Binaries 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 conflict. > 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... Gerhard _______________________________________________ cvsnt mailing list cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt https://www.march-hare.com/cvspro/en.asp#downcvs ###################################################################### Attention: This e-mail message is privileged and confidential. If you are not the intended recipient please delete the message and notify the sender. Any views or opinions presented are solely those of the author. ######################################################################