Handle the case where the patch that is being replaced with quilt import -f has
a different strip level than the one in the series.
We don't want this happening:
$ quilt import ratings-menu-4762.patch
new patch comes with -p0 patch level
$ quilt import -f -p0 ratings-menu-4762.patch
$ cat series
ratings-menu-4762.patch
Signed-off-by: Brandon Philips <[EMAIL PROTECTED]>
---
quilt/import.in | 3 +++
1 file changed, 3 insertions(+)
Index: quilt/quilt/import.in
===================================================================
--- quilt.orig/quilt/import.in
+++ quilt/quilt/import.in
@@ -178,6 +178,9 @@ do
fi
printf $"Replacing patch %s with new version\n" \
"$(print_patch $patch)" >&2
+
+ [ "$opt_strip" != $(patch_strip_level $patch_file) ] \
+ && change_db_strip_level "$patch_args" "$patch_file"
elif [ -e "$dest" ]
then
printf $"Importing patch %s\n" "$(print_patch $patch)"
_______________________________________________
Quilt-dev mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/quilt-dev
