Date: Tue, 03 Feb 2009 20:31:33 +0000 From: Tom Evans <tevans.uk@googlemail.com> To: Chuck Robey <chuckr@telenix.org> Cc: freebsd-hackers@freebsd.org, "Aryeh M. Friedman" <aryeh.friedman@gmail.com> Subject: Re: usinig cvs diff to make a patch Message-ID: <1233693093.82064.4.camel@jacob.nubtek.com> In-Reply-To: <49889BD1.40107@telenix.org> References: <49889842.9050103@gmail.com> <49889BD1.40107@telenix.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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-unsubscribe@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1233693093.82064.4.camel>