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 email@example.com.
That still leaves a potential check in error though doesn't it? In the case where changes were made in both main trunk and a branch, a merge+(copy due to -kb) may end up clobbering the changes made in the main trunk. Is there a way to detect that simultaneous changes were made in both branches ? > -----Original Message----- > From: cvsnt-bounces at cvsnt.org > [mailto:cvsnt-bounces at cvsnt.org]On Behalf > Of Hartmut Honisch > Sent: Friday, January 02, 2004 8:37 AM > To: cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook > Subject: RE: [cvsnt] Re: How to prevent CVSNT from merging > binary files? > > > > The -kb option disables keyword expansion and line ending > conversion, > > which is disireable for binary files in the archive. It > should have no > > effect on how your file gets updated. I'm not sure the > best way to flag > > a file to not be updated, for instance when you update the whole > > directory containing that file, but this seems like a > useful thing to > > know if anyone else can provide the answer. > > The current release of CVSNT fixes this behaviour: -kb both > disables keyword > expansion and prevents CVSNT from merging changes into your > modified sandbox > files. If CVSNT needs to update a binary file that has been > modified, it > renames the local copy to ".#foo.revision" and gives you a clean copy > (instead of trying to merge the repository changes into the > local file). > > -Hartmut > > _______________________________________________ > 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 >