[Quilt-dev] [PATCH 2/2] pop: Harmonize `patch --force` usage between push and pop.

[Benjamin Poirier]

push:apply_patch() uses --force by default but pop:check_for_pending_changes()
does not. This leads to a problem when trying to pop a patch that changes
files which were originally read-only: patch refuses to touch them.
---
 quilt/pop.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/quilt/pop.in b/quilt/pop.in
index 8b69f64..63367dc 100644
--- a/quilt/pop.in
+++ b/quilt/pop.in
@@ -108,7 +108,7 @@ check_for_pending_changes()
                if ! cat_file $patch_file \
                     | patch -d $workdir $QUILT_PATCH_OPTS \
                             $(patch_args $patch) \
-                            --no-backup-if-mismatch -E \
+                            --no-backup-if-mismatch -E --force \
                             >/dev/null 2>/dev/null
                then
                        printf $"Failed to patch temporary files\n" >&2
-- 
1.7.7