Mercurial > evolve
changeset 3740:07e246deb612
evolve: show cset hash in "update to local conflict" message
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sun, 29 Apr 2018 19:14:41 +0530 |
| parents | 0bfc4fe3baf8 |
| children | ec460882eab7 |
| files | hgext3rd/evolve/evolvecmd.py tests/test-divergent.t tests/test-stabilize-result.t |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Sun Apr 29 19:11:29 2018 +0530 +++ b/hgext3rd/evolve/evolvecmd.py Sun Apr 29 19:14:41 2018 +0530 @@ -402,7 +402,8 @@ % divergent)) return (False, '') if divergent not in repo[None].parents(): - repo.ui.status(_('updating to "local" conflict\n')) + repo.ui.status(_("updating to \"local\" side of the conflict: %s\n") % + divergent.hex()[:12]) hg.updaterepo(repo, divergent.node(), False) repo.ui.note(_('merging %s changeset\n') % TROUBLES['CONTENTDIVERGENT']) if progresscb:
--- a/tests/test-divergent.t Sun Apr 29 19:11:29 2018 +0530 +++ b/tests/test-divergent.t Sun Apr 29 19:14:41 2018 +0530 @@ -57,7 +57,7 @@ merge:[2] add bdivergent1 with: [3] add bdivergent2 base: [1] add _b - updating to "local" conflict + updating to "local" side of the conflict: c2f698071cba 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory is now at c26f1d3baed2 $ hg log -G @@ -101,7 +101,7 @@ merge:[6] add cdivergent1 with: [7] cdivergent2 base: [5] add _c - updating to "local" conflict + updating to "local" side of the conflict: 26c7705fee96 0 files updated, 0 files merged, 0 files removed, 0 files unresolved nothing changed working directory is now at 26c7705fee96
--- a/tests/test-stabilize-result.t Sun Apr 29 19:11:29 2018 +0530 +++ b/tests/test-stabilize-result.t Sun Apr 29 19:14:41 2018 +0530 @@ -415,7 +415,7 @@ merge:[17] More addition (2) with: [18] More addition (2) base: [16] More addition - updating to "local" conflict + updating to "local" side of the conflict: 0b336205a5d0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory is now at e015aa78acee $ glog