Mercurial > evolve
changeset 1116:d4977b04ef98
evolve: update evolve merge message
People are apparently unaware of --succ
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 30 Sep 2014 10:27:11 -0500 |
| parents | 5d574b92203c |
| children | 98f4e356a431 |
| files | hgext/evolve.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Mon Sep 22 17:27:57 2014 -0700 +++ b/hgext/evolve.py Tue Sep 30 10:27:11 2014 -0500 @@ -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 <old> --succ <new>` to obsolete the old one") destbookmarks = repo.nodebookmarks(dest.node()) nodesrc = orig.node() destphase = repo[nodesrc].phase()