Let "quilt patches" also match deleted files in unapplied patches.
Commit 4df47975 was supposed to fix that already, but did not really.
---
quilt/patches.in | 2 +-
test/two.test | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
--- a/quilt/patches.in
+++ b/quilt/patches.in
@@ -63,7 +63,7 @@ touched_by_patch()
[ $strip = ab ] && strip=1
cat_file $(patch_file_name $patch) \
| awk '
- /^\+\+\+[ \t]/ {
+ /^(\+\+\+|---)[ \t]/ {
sub(/^(\+\+\+|---)[ \t]/, "")
sub(/[ \t][^ \t]*$/, "")
sub(/^\/dev\/null/, "")
--- a/test/two.test
+++ b/test/two.test
@@ -160,3 +160,17 @@
> Removing patch %{_P}patch2.diff
> Removing patch %{_P}patch1.diff
> No patches applied
+
+ $ quilt patches file4
+ > ../patches/patch1.diff
+ > ../patches/subdir/patch3.diff
+
+ $ quilt push -qa
+ > Applying patch ../patches/patch1.diff
+ > Applying patch ../patches/patch2.diff
+ > Applying patch ../patches/subdir/patch3.diff
+ > Now at patch ../patches/subdir/patch3.diff
+
+ $ quilt patches file4
+ > ../patches/patch1.diff
+ > ../patches/subdir/patch3.diff
--
Jean Delvare
Suse L3
_______________________________________________
Quilt-dev mailing list
[email protected]
https://lists.nongnu.org/mailman/listinfo/quilt-dev
