Prevent most commands from running when there are conflicts

[stgit] / stgit / commands / coalesce.py

diff --git a/stgit/commands/coalesce.py b/stgit/commands/coalesce.py
index 7eb89db647edc0ee1f5de0deec6d62826dce302b..07a9753e5e526198aa5002d2286712c6b0d8c165 100644 (file)
--- a/stgit/commands/coalesce.py
+++ b/stgit/commands/coalesce.py
@@ -79,7 +79,8 @@ def _coalesce(stack, iw, name, msg, save_template, patches):
         trans.patches[name] = stack.repository.commit(new_commit_data)
         trans.unapplied.insert(0, name)
 
         trans.patches[name] = stack.repository.commit(new_commit_data)
         trans.unapplied.insert(0, name)
 

-    trans = transaction.StackTransaction(stack, 'coalesce')
+    trans = transaction.StackTransaction(stack, 'coalesce',
+                                         allow_conflicts = True)

     push_new_patch = bool(set(patches) & set(trans.applied))
     try:
         new_commit_data = _coalesce_patches(trans, patches, msg, save_template)
     push_new_patch = bool(set(patches) & set(trans.applied))
     try:
         new_commit_data = _coalesce_patches(trans, patches, msg, save_template)