If a patch can't be removed cleanly, suggest running "quilt diff -z" to spot the pending changes.
Signed-off-by: Jean Delvare <[email protected]> --- quilt/pop.in | 1 + test/failpop.test | 1 + test/three.test | 1 + 3 files changed, 3 insertions(+) --- quilt.orig/quilt/pop.in +++ quilt/quilt/pop.in @@ -116,6 +116,7 @@ check_for_pending_changes() then printf $"Patch %s does not remove cleanly (refresh it or enforce with -f)\n" \ "$(print_patch "$patch")" >&2 + printf $"Hint: \`quilt diff -z' will show the pending changes.\n" >&2 status=1 fi rm -rf $workdir --- quilt.orig/test/failpop.test +++ quilt/test/failpop.test @@ -25,5 +25,6 @@ $ mv patches/test.new patches/test.diff $ quilt pop > Patch %{P}test.diff does not remove cleanly (refresh it or enforce with -f) + > Hint: `quilt diff -z' will show the pending changes. $ echo %{?} > 1 --- quilt.orig/test/three.test +++ quilt/test/three.test @@ -65,6 +65,7 @@ $ quilt pop > Patch %{P}patch1.diff does not remove cleanly (refresh it or enforce with -f) + > Hint: `quilt diff -z' will show the pending changes. $ quilt refresh > Refreshed patch %{P}patch1.diff -- Jean Delvare SUSE L3 Support _______________________________________________ Quilt-dev mailing list [email protected] https://lists.nongnu.org/mailman/listinfo/quilt-dev
