Merge branch 'stable'

[stgit] / stgit / commands / edit.py

diff --git a/stgit/commands/edit.py b/stgit/commands/edit.py
index 6d7fbd5785107190a0f77fe32d9b2a2a97d77c68..a8499c6301527ef8c4e107c82678cd1b4e2a93c7 100644 (file)
--- a/stgit/commands/edit.py
+++ b/stgit/commands/edit.py
@@ -173,7 +173,7 @@ def func(parser, options, args):
     # The patch applied, so now we have to rewrite the StGit patch
     # (and any patches on top of it).
     iw = stack.repository.default_iw
-    trans = transaction.StackTransaction(stack, 'edit')
+    trans = transaction.StackTransaction(stack, 'edit', allow_conflicts = True)
     if patchname in trans.applied:
         popped = trans.applied[trans.applied.index(patchname)+1:]
         assert not trans.pop_patches(lambda pn: pn in popped)