[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    Re: kscd patch: disabling/removing kscdmagic for the release.
From:       Simon Hausmann <sh () caldera ! de>
Date:       2000-08-30 9:12:05
[Download RAW message or body]

On Wed, Aug 30, 2000 at 02:07:10AM -0700, Alex Zepeda wrote:
> On Wed, Aug 30, 2000 at 06:16:33AM +0200, Dirk Foersterling wrote:
> 
> > > There's no chance I could convince you to use unified or context diffs is
> > > there?
> > 
> > Well, I usually use context diffs myself. I just didn't figure out how
> > to do it using cvs diff (It seems there is not option to cvs diff that
> > allows creation of context diffs). Any hint?
> 
> cvs <cvs flags> diff <diff flags> filespec
> 
> cvs -z9 diff -u -r 1.1 -r 1.2 somefile
> 
> Will give a unified diff between versions 1.1 and 1.2 of somefile.

Or just add
"diff -b -p -u"
to your ~/.cvsrc :-)

(and the just cvs diff file)

Bye,
 Simon

[prev in list] [next in list] [prev in thread] [next in thread]