r71246 - /website/howto/quilt.pod
ddumont-guest at users.alioth.debian.org
ddumont-guest at users.alioth.debian.org
Sat Mar 12 13:14:29 UTC 2011
Author: ddumont-guest
Date: Sat Mar 12 13:13:14 2011
New Revision: 71246
URL: http://svn.debian.org/wsvn/?sc=1&rev=71246
Log:
fix quilt patch option for newer patch versions
Modified:
website/howto/quilt.pod
Modified: website/howto/quilt.pod
URL: http://svn.debian.org/wsvn/website/howto/quilt.pod?rev=71246&op=diff
==============================================================================
--- website/howto/quilt.pod (original)
+++ website/howto/quilt.pod Sat Mar 12 13:13:14 2011
@@ -291,12 +291,13 @@
If upstream has made a change that conflicts with a patch, one normally
force-applies the patch (with C<quilt push -f I<patch>>) and then looks at the
-resulting F<*.rej> file to see what part of the patch failed. By default, the
-F<*.rej> file is a traditional context diff similar to the output of C<diff
--c>. If you're used to the output of C<diff -u>, you can tell C<quilt> to
-create unified context diffs for the F<*.rej> files by putting:
-
- QUILT_PATCH_OPTS="--unified-reject-files"
+resulting F<*.rej> file to see what part of the patch failed. By default,
+rejected hunks come out in unified diff format if the input patch was of that format,
+otherwise in ordinary context diff form. If you're using patches in context diff
+format, you can tell C<quilt> to create unified context diffs for
+the F<*.rej> files by putting:
+
+ QUILT_PATCH_OPTS="--reject-format=unified"
in your F<~/.quiltrc> or by setting that variable in the environment.
@@ -324,6 +325,8 @@
=item * Russ Allbery <rra at debian.org>
=item * Jonathan Yu <jawnsy at cpan.org>
+
+=item * Dominique Dumont <ddumont at cpan.org>
=back
More information about the Pkg-perl-cvs-commits
mailing list