# HG changeset patch # User Pierre-Yves David # Date 1412090831 18000 # Node ID d4977b04ef983c9f515a5f2283a86858eeb6d025 # Parent 5d574b92203cbd9a917a3c06d42a63f573881360 evolve: update evolve merge message People are apparently unaware of --succ diff --git a/hgext/evolve.py b/hgext/evolve.py --- a/hgext/evolve.py +++ b/hgext/evolve.py @@ -779,7 +779,7 @@ if not orig.p2().rev() == node.nullrev: raise util.Abort( 'no support for evolving merge changesets yet', - hint="Redo the merge and use `hg prune` to obsolete the old one") + hint="Redo the merge and use `hg prune --succ ` to obsolete the old one") destbookmarks = repo.nodebookmarks(dest.node()) nodesrc = orig.node() destphase = repo[nodesrc].phase()