diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2003-02-05 14:42:37 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2003-02-05 14:42:37 +0000 |
| commit | aa7a0c42a70030064a436128974fb6e744874f60 (patch) | |
| tree | b8788cb9008ede5418876457f8fbd9de973ba040 | |
| parent | 49e0ddc32a3da6a1e4770b704a0a73badf94f3bf (diff) | |
| download | quilt-aa7a0c42a70030064a436128974fb6e744874f60.tar.gz | |
*** empty log message ***
| -rw-r--r-- | quilt.changes | 2 | ||||
| -rw-r--r-- | quilt/diff.in | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/quilt.changes b/quilt.changes index 60c839c..f8eb4f8 100644 --- a/quilt.changes +++ b/quilt.changes @@ -4,7 +4,7 @@ Wed Feb 5 12:37:34 +0100 2003 - agruen@suse.de - Quilt diff: If a patch has been force applied, quilt diff -z will also have failures when generating the temporary files. Ignore these failures in this case. -- Add -r option to quilt diff to generate a a reverse patch. +- Add -R option to quilt diff to generate a a reverse patch. - Fix deleting the temporary directory (by using an absolute instead of a relative path). diff --git a/quilt/diff.in b/quilt/diff.in index 7f1a084..e08ee2c 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -24,7 +24,7 @@ usage() then redirect='>&2' fi - echo "Usage: quilt diff [-p n] [-c patch|-z] [-r] [-P patch] [file ...]" $redirect + echo "Usage: quilt diff [-p n] [-c patch|-z] [-R] [-P patch] [file ...]" $redirect if [ x$1 = x-h ] then @@ -48,7 +48,7 @@ by default. Create a combined diff for all patches between this patch and the patch specified with -P. --r Create a reverse diff. +-R Create a reverse diff. -z Write to standard output the changes that have been made relative to the topmost or specified patch. @@ -90,7 +90,7 @@ die () exit $status } -options=`getopt -o p:P:c:rzh --long diff: -- "$@"` +options=`getopt -o p:P:c:Rzh --long diff: -- "$@"` if [ $? -ne 0 ] then @@ -111,7 +111,7 @@ do -c) opt_combine=$2 shift 2 ;; - -r) + -R) opt_reverse=1 shift ;; -z) @@ -225,6 +225,7 @@ trap "die 1" SIGTERM if [ -n "$opt_relative" ] then patch_file=$(patch_file_name $last_patch) + pc_file=$(pc_file_name $last_patch) patch_args=$(patch_args $last_patch) workdir=$(@MKTEMP@ -d $PWD/patch-scripts.XXXXXX) pwd=$PWD @@ -256,7 +257,7 @@ then # files won't succeed, either. So, ignore the error # in that particular case. - if ! [ -e $(pc_file_name $last_patch)~refresh ] + if ! [ -e $pwd/$pc_file~refresh ] then echo "Failed to patch temporary files" die 1 |