On Thu, Jan 17, 2013 at 10:53:42AM +0100, Jean Delvare wrote: > This doesn't apply clealy on top of the repository, please rebase.
See in attachment. Sorry, Mt. -- Les coups et les douleurs, ca se discute pas.
Description: Verbosly fail when trying to push a non existant patch Useful if there is a typo in the serie file. This can be overriden by providing -f. Bug-Debian: http://bugs.debian.org/358875 Forwarded: sent 2012-12-19 --- quilt/push.in | 7 +++++++ test/missing.test | 4 ++++ 2 files changed, 11 insertions(+) Index: quilt-upstream/quilt/push.in =================================================================== --- quilt-upstream.orig/quilt/push.in 2013-01-18 15:42:15.146731002 +0100 +++ quilt-upstream/quilt/push.in 2013-01-18 15:44:31.773007413 +0100 @@ -186,6 +186,13 @@ no_reject_files="-r $tmp" fi + if [ ! -e "$patch_file" -a -z "$opt_force" ] + then + printf $"Patch %s does not exist\n" \ + "$(print_patch $patch)" >&2 + return 1 + fi + apply_patch "$patch" "$patch_file" status=$? trap "" SIGINT Index: quilt-upstream/test/missing.test =================================================================== --- quilt-upstream.orig/test/missing.test 2013-01-18 15:42:15.146731002 +0100 +++ quilt-upstream/test/missing.test 2013-01-18 15:44:49.573303734 +0100 @@ -5,6 +5,10 @@ < missing2.diff $ quilt push -qa + > Patch patches/missing1.diff does not exist + > Applying patch patches/missing1.diff + + $ quilt push -qaf > Applying patch patches/missing1.diff > Patch patches/missing1.diff does not exist; applied empty patch > Applying patch patches/missing2.diff
_______________________________________________ Quilt-dev mailing list [email protected] https://lists.nongnu.org/mailman/listinfo/quilt-dev
