Re: usinig cvs diff to make a patch

2009-02-03 Thread Garance A Drosihn

At 2:17 PM -0500 2/3/09, Aryeh M. Friedman wrote:
I use a local cvs repo and I have modified a port and which to 
submit an update for it how do I generate a patch file with cvs (cvs 
diff seems to give a unusable format)?


try:   cvs diff -u

In my case, i have added the following line to my ~/.cvsrc file:

diff -uN

(-N means treat absent files as empty)

--
Garance Alistair Drosehn=   g...@gilead.netel.rpi.edu
Senior Systems Programmer   or  g...@freebsd.org
Rensselaer Polytechnic Instituteor  dro...@rpi.edu
___
freebsd-hackers@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-hackers
To unsubscribe, send any mail to freebsd-hackers-unsubscr...@freebsd.org


Re: usinig cvs diff to make a patch

2009-02-03 Thread Chuck Robey
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Aryeh M. Friedman wrote:
 I use a local cvs repo and I have modified a port and which to submit an
 update for it how do I generate a patch file with cvs (cvs diff seems to
 give a unusable format)?
 ___
 freebsd-hackers@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/freebsd-hackers
 To unsubscribe, send any mail to freebsd-hackers-unsubscr...@freebsd.org

cvs diff -u gives the unified format (or cvs diff -c for context, get the
pattern?)  Or, copying from the web page
http://www.eyrie.org/~eagle/notes/cvs/basic-usage.html, which shows how to use
the ~/.cvsrc file to make common cvs commands default the way you want them to,
you could put into that file the line diff -u so it always gives you the
unified diff format, which just happens to be the easiest for humans to read,
and the format specified in FreeBSD (hint, hint).
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (FreeBSD)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkmIm9EACgkQz62J6PPcoOnRlQCeIT8vsLZ6LI764WOaTQy72ym4
Tp0AoJ43TIQYsGFz8YYD2ChhMSUU0Wpc
=ta5/
-END PGP SIGNATURE-
___
freebsd-hackers@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-hackers
To unsubscribe, send any mail to freebsd-hackers-unsubscr...@freebsd.org


Re: usinig cvs diff to make a patch

2009-02-03 Thread Tom Evans
On Tue, 2009-02-03 at 14:32 -0500, Chuck Robey wrote:
 Aryeh M. Friedman wrote:
  I use a local cvs repo and I have modified a port and which to submit an
  update for it how do I generate a patch file with cvs (cvs diff seems to
  give a unusable format)?
  ___
  freebsd-hackers@freebsd.org mailing list
  http://lists.freebsd.org/mailman/listinfo/freebsd-hackers
  To unsubscribe, send any mail to freebsd-hackers-unsubscr...@freebsd.org
 
 cvs diff -u gives the unified format (or cvs diff -c for context, get the
 pattern?)  Or, copying from the web page
 http://www.eyrie.org/~eagle/notes/cvs/basic-usage.html, which shows how to use
 the ~/.cvsrc file to make common cvs commands default the way you want them 
 to,
 you could put into that file the line diff -u so it always gives you the
 unified diff format, which just happens to be the easiest for humans to read,
 and the format specified in FreeBSD (hint, hint).

When reading this, I was immediately reminded of this passage from
development(7), describing how to set up a local cvs repository for
src/ports...:

... you need to set up a ~/.cvsrc (/root/.cvsrc) file, as shown
below, for proper cvs(1) operation.  Using ~/.cvsrc to specify
cvs(1) defaults is an excellent way to ``file and forget'', but
you should never forget that you put them in there.

# cvs -q
diff -u
update -Pd
checkout -P

Cheers

Tom


___
freebsd-hackers@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-hackers
To unsubscribe, send any mail to freebsd-hackers-unsubscr...@freebsd.org


Re: usinig cvs diff to make a patch

2009-02-03 Thread Dimitry Andric
On 2009-02-03 20:17, Aryeh M. Friedman wrote:
 I use a local cvs repo and I have modified a port and which to submit an 
 update for it how do I generate a patch file with cvs (cvs diff seems to 
 give a unusable format)?

Use cvs diff -up for unified diff format, with function prototypes.


___
freebsd-hackers@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-hackers
To unsubscribe, send any mail to freebsd-hackers-unsubscr...@freebsd.org


usinig cvs diff to make a patch

2009-02-03 Thread Aryeh M. Friedman
I use a local cvs repo and I have modified a port and which to submit an 
update for it how do I generate a patch file with cvs (cvs diff seems to 
give a unusable format)?

___
freebsd-hackers@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-hackers
To unsubscribe, send any mail to freebsd-hackers-unsubscr...@freebsd.org


Re: usinig cvs diff to make a patch

2009-02-03 Thread Scott Ullrich
On Tue, Feb 3, 2009 at 2:17 PM, Aryeh M. Friedman
aryeh.fried...@gmail.com wrote:
 I use a local cvs repo and I have modified a port and which to submit an
 update for it how do I generate a patch file with cvs (cvs diff seems to
 give a unusable format)?

Maybe try cvs diff -uN ?

Scott
___
freebsd-hackers@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-hackers
To unsubscribe, send any mail to freebsd-hackers-unsubscr...@freebsd.org