Patchwork [7,of,7,evolve-ext] evolve: report merge node

login
register
mail settings
Submitter timeless@gcc2-power8.osuosl.org
Date April 14, 2016, 3:05 p.m.
Message ID <7b77108bde6bd448a8fc.1460646322@gcc2-power8.osuosl.org>
Download mbox | patch
Permalink /patch/14608/
State Accepted
Headers show

Comments

timeless@gcc2-power8.osuosl.org - April 14, 2016, 3:05 p.m.
# HG changeset patch
# User timeless@gmail.com
# Date 1460646198 0
#      Thu Apr 14 15:03:18 2016 +0000
# Node ID 7b77108bde6bd448a8fc463c9ba8aef8c47c954f
# Parent  afccba390673c1aecc0f2ac1dabad3b487fc6fe9
# Available At https://bitbucket.org/timeless/mutable-history/
#              hg pull https://bitbucket.org/timeless/mutable-history/ -r 7b77108bde6b
evolve: report merge node

When running evolve --any, evolve will report that it can not
handle a merge node. In order for this to be helpful, we report
the revision so that a user could fix t.
Pierre-Yves David - April 14, 2016, 7:01 p.m.
Wow a carpet bomb of fixed \o/ awesome.

All of them are pushed except for patch 4. I would like more details 
about patch 4.

Patch

diff -r afccba390673 -r 7b77108bde6b hgext/evolve.py
--- a/hgext/evolve.py	Thu Apr 14 15:02:10 2016 +0000
+++ b/hgext/evolve.py	Thu Apr 14 15:03:18 2016 +0000
@@ -1879,8 +1879,8 @@ 
         if not pctx.obsolete():
             pctx = orig.p2()  # second parent is obsolete ?
         elif orig.p2().obsolete():
-            hint = _("Redo the merge and use `hg prune <old> "
-                     "--succ <new>` to obsolete the old one")
+            hint = _("Redo the merge (%s) and use `hg prune <old> "
+                     "--succ <new>` to obsolete the old one") % orig.hex()[:12]
             ui.warn(_("warning: no support for evolving merge changesets "
                       "with two obsolete parents yet\n") +
                     _("(%s)\n") % hint)
diff -r afccba390673 -r 7b77108bde6b tests/test-unstable.t
--- a/tests/test-unstable.t	Thu Apr 14 15:02:10 2016 +0000
+++ b/tests/test-unstable.t	Thu Apr 14 15:03:18 2016 +0000
@@ -155,7 +155,7 @@ 
 
   $ hg evo --all --any --unstable
   warning: no support for evolving merge changesets with two obsolete parents yet
-  (Redo the merge and use `hg prune <old> --succ <new>` to obsolete the old one)
+  (Redo the merge (6b4280e33286) and use `hg prune <old> --succ <new>` to obsolete the old one)
   $ hg log -G
   @  5:2db39fda7e2f@default(draft) cprime
   |