# HG changeset patch # User Pierre-Yves David # Date 1316569799 -7200 # Node ID 780a222d547da08c6ca9bfd4a75a844bd52cf6a4 # Parent 1b962aaf0c7d0779f97406d611eb212b059d2a6a [evolution:evolve] use short hex instead of rev number diff -r 1b962aaf0c7d -r 780a222d547d hgext/evolution.py --- a/hgext/evolution.py Tue Sep 20 18:17:08 2011 +0200 +++ b/hgext/evolution.py Wed Sep 21 03:49:59 2011 +0200 @@ -150,7 +150,7 @@ assert obs.obsolete() newer = obsolete.newerversion(repo, obs.node()) target = newer[-1] - repo.ui.status('hg relocate --rev %s %s\n' % (next, repo[target].rev())) + repo.ui.status('hg relocate --rev %s %s\n' % (repo[next], repo[target])) @command('^relocate', [ diff -r 1b962aaf0c7d -r 780a222d547d tests/test-evolution.t --- a/tests/test-evolution.t Tue Sep 20 18:17:08 2011 +0200 +++ b/tests/test-evolution.t Wed Sep 21 03:49:59 2011 +0200 @@ -202,7 +202,7 @@ 1 : a nifty feature - test 0 : base - test $ hg evolve - hg relocate --rev 4 6 + hg relocate --rev 8c7704f377af 1075109f9999 $ hg up feature-B -q #prevent feature-A bookmark to move grml $ hg relocate -r 4 6 --traceback merging main-file-1