[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: update -jx -jy gives conflict on $Id$

From: Mike Castle
Subject: Re: update -jx -jy gives conflict on $Id$
Date: Thu, 8 Mar 2001 19:07:33 -0800
User-agent: Mutt/1.3.6i

On Thu, Mar 08, 2001 at 04:22:16PM -0800, Stephen Rasku wrote:
> That shouldn't apply in this case since he was attempting a merge of, 
> apparently, a .c file.  You can't merge binary files with CVS.

cvs up -kk -jb1 -jb2
make test

test fails... hmmm.....
oh... broken binary file that wasn't part of the merge... oh damn

cvs up -A
make clean
make test

Granted, not that big of a deal, but annoying.

And does answer the question as to why one doesn't want to use -kk.  It can
also be a little slow having to rewrite all of your files when doing the

       Mike Castle       Life is like a clock:  You can work constantly
  address@hidden  and be right all the time, or not work at all and be right at least twice a day.  -- mrc
    We are all of us living in the shadow of Manhattan.  -- Watchmen

reply via email to

[Prev in Thread] Current Thread [Next in Thread]