Mercurial > evolve
changeset 546:415540dee2bd stable
fix missing --dest evolve output in dryrun
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Mon, 10 Sep 2012 17:33:06 +0200 |
| parents | 31932df8309a |
| children | c4abb0218e84 |
| files | hgext/evolve.py tests/test-stabilize-order.t tests/test-stabilize-result.t tests/test-tutorial.t |
| diffstat | 4 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Fri Aug 31 11:50:37 2012 +0200 +++ b/hgext/evolve.py Mon Sep 10 17:33:06 2012 +0200 @@ -1417,7 +1417,7 @@ repo.ui.status(_('atop:')) if not ui.quiet: displayer.show(target) - todo = 'hg rebase -Dr %s -d %s\n' % (orig, target) + todo = 'hg rebase -r %s -d %s\n' % (orig, target) if dryrun: repo.ui.write(todo) else: @@ -1453,7 +1453,7 @@ if not ui.quiet: displayer.show(prec) if dryrun: - todo = 'hg rebase --rev %s --detach %s;\n' % (latecomer, prec.p1()) + todo = 'hg rebase --rev %s --dest %s;\n' % (latecomer, prec.p1()) repo.ui.write(todo) repo.ui.write('hg update %s;\n' % prec) repo.ui.write('hg revert --all --rev %s;\n' % latecomer)
--- a/tests/test-stabilize-order.t Fri Aug 31 11:50:37 2012 +0200 +++ b/tests/test-stabilize-order.t Mon Sep 10 17:33:06 2012 +0200 @@ -65,7 +65,7 @@ $ hg evolve -v move:[5] addb atop:[7] adda - hg rebase -Dr ab8cbb6d87ff -d f5ff10856e5a + hg rebase -r ab8cbb6d87ff -d f5ff10856e5a resolving manifests getting b b @@ -91,7 +91,7 @@ $ hg evolve -v move:[3] addc atop:[8] addb - hg rebase -Dr 7a7552255fb5 -d 6bf44048e43f + hg rebase -r 7a7552255fb5 -d 6bf44048e43f resolving manifests getting b resolving manifests @@ -147,7 +147,7 @@ $ hg evolve --any -v move:[9] addc atop:[11] addb - hg rebase -Dr 5e819fbb0d27 -d 4e7cec6b4afe + hg rebase -r 5e819fbb0d27 -d 4e7cec6b4afe resolving manifests removing c getting b
--- a/tests/test-stabilize-result.t Fri Aug 31 11:50:37 2012 +0200 +++ b/tests/test-stabilize-result.t Mon Sep 10 17:33:06 2012 +0200 @@ -31,7 +31,7 @@ $ hg evolve -v move:[2] changea atop:[4] changea - hg rebase -Dr cce2c55b8965 -d 1447e1c4828d + hg rebase -r cce2c55b8965 -d 1447e1c4828d resolving manifests $ glog --hidden @ 4:1447e1c4828d@default(draft) bk:[changea] changea @@ -149,7 +149,7 @@ $ hg evolve --any --dry-run recreate:[12] newer a atop:[8] newer a - hg rebase --rev 15c83af6f3a3 --detach e8cc1b534401; + hg rebase --rev 15c83af6f3a3 --dest e8cc1b534401; hg update e3183e9c0961; hg revert --all --rev 15c83af6f3a3; hg commit --msg "latecomer update to %s" (no-eol)
--- a/tests/test-tutorial.t Fri Aug 31 11:50:37 2012 +0200 +++ b/tests/test-tutorial.t Mon Sep 10 17:33:06 2012 +0200 @@ -627,7 +627,7 @@ $ hg evolve --dry-run move:[15] animals atop:[14] bathroom stuff - hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818 + hg rebase -r 9ac5d0e790a2 -d ffa278c50818 Let's do it