info-cvs
[Top][All Lists]
Advanced

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

Re: cvs diff output PATCH input? (was: synchronize two repositories)


From: Mike Castle
Subject: Re: cvs diff output PATCH input? (was: synchronize two repositories)
Date: Mon, 9 Oct 2000 14:49:36 -0500
User-agent: Mutt/1.3.6i

On Mon, Oct 09, 2000 at 03:27:41PM -0400, Derek R. Price wrote:
> Robert Bresner wrote:
> 
> > So. Is there a way to get "cvs diff" to output information that
> > can then be used by patch?
> 
> The output of CVS diff is usable directly by Larry Wall's GNU patch 2.5 & 
> maybe
> earlier.  GNU patch 2.5 is smart enough to ignore some of the header 
> information CVS
> diff outputs.  I've had some problems with earlier versions of patch aborting 
> with

This may have already be addressed.  I've been skipping a lot of emails
since just got back from vacation.  But, just in case it hasn't been said:
 
cvs diff -c is usuable by patch.  cvs diff alone is not.

cvs diff -u builds a unified diff that is more compact, but doesn't work
with older versions of patch (solution: install latest version of patch).

mrc
-- 
       Mike Castle       Life is like a clock:  You can work constantly
  address@hidden  and be right all the time, or not work at all
www.netcom.com/~dalgoda/ 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]