Mercurial > evolve
changeset 947:9a6cc7e6f0dd stable
evolve: improve wording of a few of messages
| author | Angel Ezquerra <angel.ezquerra@gmail.com> |
|---|---|
| date | Tue, 29 Apr 2014 22:25:35 +0200 |
| parents | dedd5359340f |
| children | b2b3d5aa16bc |
| files | hgext/evolve.py tests/test-stabilize-result.t |
| diffstat | 2 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Tue Apr 29 22:25:21 2014 +0200 +++ b/hgext/evolve.py Tue Apr 29 22:25:35 2014 +0200 @@ -749,7 +749,7 @@ # dummy state to trick rebase node if not orig.p2().rev() == node.nullrev: raise util.Abort( - 'no support for evolution merge changesets yet', + 'no support for evolving merge changesets yet', hint="Redo the merge a use `hg prune` to obsolete the old one") destbookmarks = repo.nodebookmarks(dest.node()) nodesrc = orig.node() @@ -893,9 +893,9 @@ if contopt: if anyopt: - raise util.Abort('can not specify both "--any" and "--continue"') + raise util.Abort('cannot specify both "--any" and "--continue"') if allopt: - raise util.Abort('can not specify both "--all" and "--continue"') + raise util.Abort('cannot specify both "--all" and "--continue"') graftcmd = commands.table['graft'][0] return graftcmd(ui, repo, old_obsolete=True, **{'continue': True}) @@ -1189,7 +1189,8 @@ hint = ("changeset %d is divergent with a changeset that got splitted " "| into multiple ones:\n[%s]\n" "| This is not handled by automatic evolution yet\n" - "| You have to fallback to manual handling with commands as:\n" + "| You have to fallback to manual handling with commands " + "such as:\n" "| - hg touch -D\n" "| - hg prune\n" "| \n" @@ -1204,7 +1205,7 @@ if len(other.parents()) > 1: raise util.Abort("divergent changeset can't be a merge (yet)", hint="You have to fallback to solving this by hand...\n" - "| This probably mean to redo the merge and use " + "| This probably means redoing the merge and using " "| `hg prune` to kill older version.") if other.p1() not in divergent.parents(): raise util.Abort("parents are not common (not handled yet)", @@ -1258,7 +1259,8 @@ 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('Merge conflict between several amendments, and this is not yet automated', + raise util.Abort('merge conflict between several amendments ' + '(this is not automated yet)', 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)
--- a/tests/test-stabilize-result.t Tue Apr 29 22:25:21 2014 +0200 +++ b/tests/test-stabilize-result.t Tue Apr 29 22:25:35 2014 +0200 @@ -319,7 +319,7 @@ 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: Merge conflict between several amendments, and this is not yet automated + abort: merge conflict between several amendments (this is not automated yet) (/!\ You can try: /!\ * manual merge + resolve => new cset X /!\ * hg up to the parent of the amended changeset (which are named W and Z)