[cvsnt] How to prevent CVSNT from merging binary files?

Ian Huynh ianh at hubspan.com
Wed Dec 31 21:12:46 GMT 2003


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.


I have a follow up question on merging binary files
Sometimes a copy is sufficient but in the case where 
we have 2 branches and changes were made to both branches.

So in the merge/copy operation, a copy would probably be incorrect.

Is there a way to do some or all of the following:

1. during merge, detect that changes were made to both branches (via revision#?) 
   if there are 'conflict', flag that as error and force some sort of manual intervention.

2. or during commit, do the same detection above.



Thanks.





> -----Original Message-----
> From: cvsnt-bounces at cvsnt.org 
> [mailto:cvsnt-bounces at cvsnt.org]On Behalf
> Of Martin Cole
> Sent: Thursday, December 18, 2003 12:18 PM
> To: cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook
> Subject: Re: [cvsnt] How to prevent CVSNT from merging binary files?
> 
> 
> I checked out the cvsroot from the repository in question and 
> edited the
> cvswrappers file
> 
> eg.
> 
> I added
> 
> 
> # Wrappers for labview binary files
> *.vi -m 'COPY'
> *.llb -m 'COPY'
> *.llx -m 'COPY'
> *.mnu -m 'COPY'
> *.ctl -m 'COPY'
> *.vit -m 'COPY'
> *.rtm -m 'COPY'
> 
> 
> for labview files and then committed my changes, and it works 
> correctly now.
> 
> Marts
> 
> 
> 
> ----- Original Message ----- 
> From: "Hartmut Honisch" <hartmut_honisch at web.de>
> To: <cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook>
> Sent: Thursday, December 18, 2003 12:15 PM
> Subject: [cvsnt] How to prevent CVSNT from merging binary files?
> 
> 
> > I have a file in my repository that I've declared as 
> "binary" (-kb). When
> > that file changes in the repository, CVSNT merges the 
> changes into the
> > working copy of my local file, just as if it was a normal 
> text file. I've
> > always thought that -kb tells CVSNT _not_ to merge a file - 
> but apparently
> > it does it anyway.
> >
> > Is this the desired behaviour, and if so, how do I prevent 
> CVSNT from
> > merging repository changes into my modified working copy?
> >
> > I use 2.0.14 on Win2K SP4
> >
> > -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
> >
> 
> 
> _______________________________________________
> 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
> 



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