Re: Help With CVS For CircleMUD

From: George Greer (greerga@circlemud.org)
Date: 08/17/02


On Sat, 17 Aug 2002, Mythran wrote:

>I am trying to get the options -upNr for diff.  When I try the following:
>
>cvs diff -upNr blah1 blah2 >> something.patch

greerga@cambot:~$ cat ~/.cvsrc
rdiff -u
diff -up
cvs -z3

>It works...but when I view the file something.patch, the lines say diff -N blah1 blah2.
>
>So, why isn't -u -p or -r options listed and in effect?

-r and -N aren't useful because of how 'cvs diff' works; you get those
free.  As for -u and -p, I'm not sure why they're not showing up.  You
might try using a .cvsrc file instead:

Index: comm.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/comm.c,v
retrieving revision 1.114
diff -u -p -r1.114 comm.c

--
George Greer
greerga@circlemud.org

--
   +---------------------------------------------------------------+
   | FAQ: http://qsilver.queensu.ca/~fletchra/Circle/list-faq.html |
   | Archives: http://post.queensu.ca/listserv/wwwarch/circle.html |
   | Newbie List:  http://groups.yahoo.com/group/circle-newbies/   |
   +---------------------------------------------------------------+



This archive was generated by hypermail 2b30 : 06/25/03 PDT