Mercurial > evolve
comparison tests/test-sharing.t @ 3741:ec460882eab7
evolve: show cset hash in "merging conetnt-divergent changeset"
While I was here I also mae de it repo.ui.status() instead of repo.ui.note() to
align the behavior with rest of the messages.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sun, 29 Apr 2018 19:18:54 +0530 |
| parents | 2e703ed1c713 |
| children | 88601e1cd5d8 |
comparison
equal
deleted
inserted
replaced
| 3740:07e246deb612 | 3741:ec460882eab7 |
|---|---|
| 507 Use evolve to fix the divergence. | 507 Use evolve to fix the divergence. |
| 508 $ HGMERGE=internal:other hg evolve --content-divergent | 508 $ HGMERGE=internal:other hg evolve --content-divergent |
| 509 merge:[5] fix bug 24 (v2 by bob) | 509 merge:[5] fix bug 24 (v2 by bob) |
| 510 with: [6] fix bug 24 (v2 by alice) | 510 with: [6] fix bug 24 (v2 by alice) |
| 511 base: [4] fix bug 24 (v1) | 511 base: [4] fix bug 24 (v1) |
| 512 merging "other" content-divergent changeset 'e3f99ce9d9cd' | |
| 512 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 513 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 513 working directory is now at 5ad6037c046c | 514 working directory is now at 5ad6037c046c |
| 514 $ hg log -q -r 'contentdivergent()' | 515 $ hg log -q -r 'contentdivergent()' |
| 515 | 516 |
| 516 Figure SG10: Bob's repository after fixing divergence. | 517 Figure SG10: Bob's repository after fixing divergence. |