Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
a better msg for this tricky situation stable
authorAurelien Campeas <aurelien.campeas@logilab.fr>
Thu, 30 Aug 2012 13:54:43 +0200
branchstable
changeset 534 45ccaba212f9
parent 533 87c41ef95ebf
child 535 47246c32e0fb
a better msg for this tricky situation
hgext/evolve.py file | annotate | diff | comparison | revisions
tests/test-stabilize-result.t file | annotate | diff | comparison | revisions 
--- a/hgext/evolve.py	Thu Aug 30 13:50:17 2012 +0200
+++ b/hgext/evolve.py	Thu Aug 30 13:54:43 2012 +0200
@@ -1574,8 +1574,14 @@
             repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
                              "or 'hg update -C .' to abandon\n"))
         if stats[3] > 0:
-            raise util.Abort('GASP! Merge Conflict! You are on you own chap!',
-                hint='/!\\ hg evolve --continue will NOT work /!\\')
+            raise util.Abort('Merge conflict between several amendments, and this is not yet automated',
+                hint="""/!\ You can try:
+/!\ * manual merge + resolve => new cset X
+/!\ * hg up to the parent of the amended changeset (which are named W and Z)
+/!\ * hg revert --all -r X
+/!\ * hg ci -m "same message as the amended changeset" => new cset Y
+/!\ * hg kill -n Y W Z
+""")
         tr = repo.transaction('stabilize-conflicting')
         try:
             repo.dirstate.setparents(conflicting.node(), node.nullid)
--- a/tests/test-stabilize-result.t	Thu Aug 30 13:50:17 2012 +0200
+++ b/tests/test-stabilize-result.t	Thu Aug 30 13:54:43 2012 +0200
@@ -314,6 +314,12 @@
   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 /!\)
+  abort: Merge conflict between several amendments, and this is not yet automated
+  (/!\ You can try:
+  /!\ * manual merge + resolve => new cset X
+  /!\ * hg up to the parent of the amended changeset (which are named W and Z)
+  /!\ * hg revert --all -r X
+  /!\ * hg ci -m "same message as the amended changeset" => new cset Y
+  /!\ * hg kill -n Y W Z
+  )
   [255]
evolve