Re: how can I see what changes a cvs update would merge

[Todd Denniston]

"Robert P. J. Day" wrote:
> 
> -----Original Message-----
> From: "Jim.Hyslop" <address@hidden>
> Sent: Nov 28, 2003 9:50 AM
> To: address@hidden
> Subject: RE: how can I see what changes a cvs update would merge
> 
> Robert P. J. Day [mailto:address@hidden wrote:
> >   ???.  my cvs reference doesn't explain the "-wb" or "-i"
> > options to "cvs diff".  care to elaborate?
> Have you tried "cvs --help diff"?
> 
> -----------------
>   whoops, point taken.  i was just glancing at the 2-page CVS reference card
> i got from www.refcards.com, and it made no mention of those diff options.
> i guess there really is more than one way to do things.
> 
google on { "Quick Command Line Reference" cvs }
and you'll come up with a way to generate an `up to date` refcard for
your version of CVS.

if you want a pdf version I suggest you pipe its output through mpage
and ps2pdf :)

for the really impatient:
http://www.faqchest.com/prgm/cvs-l/cvs-99/cvs-9911/cvs-991102/cvs99110510_16799.html
or
http://www.geocrawler.com/archives/3/382/1999/4/50/2094674/

and the incredibly impatient:
http://www.enetis.net/~mitch/make-cvs-quickref

-- 
Todd Denniston
Crane Division, Naval Surface Warfare Center (NSWC Crane) 
Harnessing the Power of Technology for the Warfighter