Date: Mon, 18 Sep 2006 17:34:39 -0500 From: Brooks Davis <brooks@one-eyed-alien.net> To: MC <rossiya@gmail.com> Cc: freebsd-ports@freebsd.org Subject: Re: Basic Diff question Message-ID: <20060918223439.GA42914@lor.one-eyed-alien.net> In-Reply-To: <28a99ba50609181526s6a3ab59btfca1d6517b89c951@mail.gmail.com> References: <28a99ba50609181526s6a3ab59btfca1d6517b89c951@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--nFreZHaLTZJo0R7j Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Sep 18, 2006 at 03:26:05PM -0700, MC wrote: > Hello >=20 > I am getting going on my second port. However in this new one are many > little patches > to most of the source code. I always see '.orig' suffixes appended to in > Freebsd diff files, like >=20 > --- Src/DasherCore/FileLogger.cpp.orig Tue Jan 17 01:41:44 2006 > +++ Src/DasherCore/FileLogger.cpp Tue Jan 17 01:51:33 2006 >=20 > but for the life of me I don't know a way to produce these '.orig' suffix= es > in the patch file other than > hand editing. Using diff I never get an '.orig' suffix but something lik= e: >=20 > diff -r -u --ignore-all-space work/FFFF323-src/FFFF3.cpp > FFFF323-src/FFFF3.cpp > --- work/FFFF323-src/FFFF3.cpp Thu Mar 9 02:37:18 2006 > +++ FFFF323-src/FFFF3.cpp Fri Sep 8 04:02:57 2006 >=20 > What is the trick to this? The normal way to generate the patches is to copy the files you patch to xxx.orig. This mirrors what patch does. There's no need to do this, but it's a useful convention because it means you can easily (re)generated patches using ports/Tools/scripts/patchtool.py. -- Brooks --nFreZHaLTZJo0R7j Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (FreeBSD) iD8DBQFFDx7+XY6L6fI4GtQRAm1mAJ4qFMalFjdm1LGcTxPwdKQJGp0AogCdHr+G rWzoPRSw0hmR5/AHvb7RSho= =qtr5 -----END PGP SIGNATURE----- --nFreZHaLTZJo0R7j--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060918223439.GA42914>