# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1346327417 -7200
# Node ID 87c41ef95ebf76233db8c7781d4e1b23c859cb1b
# Parent  744db7a27dd082e73c0eb5d0e7c6b41402f391fb
test conflicting conflicting (sic) resolution

diff -r 744db7a27dd0 -r 87c41ef95ebf hgext/evolve.py
--- a/hgext/evolve.py	Wed Aug 29 11:58:21 2012 +0200
+++ b/hgext/evolve.py	Thu Aug 30 13:50:17 2012 +0200
@@ -1546,7 +1546,7 @@
         displayer.show(base)
     if dryrun:
         ui.write('hg update -c %s &&\n' % conflicting)
-        ui.write('hg merge %s && \n' % other)
+        ui.write('hg merge %s &&\n' % other)
         ui.write('hg commit -m "auto merge resolving conflict between '
                  '%s and %s"&&\n' % (conflicting, other))
         ui.write('hg up -C %s &&\n' % base)
diff -r 744db7a27dd0 -r 87c41ef95ebf tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Wed Aug 29 11:58:21 2012 +0200
+++ b/tests/test-stabilize-result.t	Thu Aug 30 13:50:17 2012 +0200
@@ -231,7 +231,7 @@
 
   $ hg evolve -qn
   hg update -c 3883461cc228 &&
-  hg merge 4754d61bc2db && 
+  hg merge 4754d61bc2db &&
   hg commit -m "auto merge resolving conflict between 3883461cc228 and 4754d61bc2db"&&
   hg up -C 7391601a4bfa &&
   hg revert --all --rev tip &&
@@ -288,3 +288,32 @@
   +less
   +conflict
   +babar
+
+Check conflicting during conflicting resolution
+-------------------------------------------------
+
+  $ hg up 15
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  Working directory parent is obsolete
+  $ echo 'gotta break' >> a
+  $ hg amend
+  1 new conflicting changesets
+  $ hg evolve -qn
+  hg update -c c956a4b140b6 &&
+  hg merge ac6d600735a4 &&
+  hg commit -m "auto merge resolving conflict between c956a4b140b6 and ac6d600735a4"&&
+  hg up -C 7391601a4bfa &&
+  hg revert --all --rev tip &&
+  hg commit -m "`hg log -r c956a4b140b6 --template={desc}`";
+  $ hg evolve
+  merge:[24] More addition
+  with: [22] More addition
+  base: [15] More addition
+  merging a
+  warning: conflicts during merge.
+  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+  abort: GASP! Merge Conflict! You are on you own chap!
+  (/!\ hg evolve --continue will NOT work /!\)
+  [255]