Mercurial > evolve
comparison tests/test-divergent.t @ 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 |
comparison
equal
deleted
inserted
replaced
| 3739:0bfc4fe3baf8 | 3740:07e246deb612 |
|---|---|
| 55 | 55 |
| 56 $ hg evolve --all --any --content-divergent | 56 $ hg evolve --all --any --content-divergent |
| 57 merge:[2] add bdivergent1 | 57 merge:[2] add bdivergent1 |
| 58 with: [3] add bdivergent2 | 58 with: [3] add bdivergent2 |
| 59 base: [1] add _b | 59 base: [1] add _b |
| 60 updating to "local" conflict | 60 updating to "local" side of the conflict: c2f698071cba |
| 61 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 61 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 62 working directory is now at c26f1d3baed2 | 62 working directory is now at c26f1d3baed2 |
| 63 $ hg log -G | 63 $ hg log -G |
| 64 @ 4:c26f1d3baed2@default(draft) add bdivergent1 [] | 64 @ 4:c26f1d3baed2@default(draft) add bdivergent1 [] |
| 65 | | 65 | |
| 99 | 99 |
| 100 $ hg evolve --all --any --content-divergent | 100 $ hg evolve --all --any --content-divergent |
| 101 merge:[6] add cdivergent1 | 101 merge:[6] add cdivergent1 |
| 102 with: [7] cdivergent2 | 102 with: [7] cdivergent2 |
| 103 base: [5] add _c | 103 base: [5] add _c |
| 104 updating to "local" conflict | 104 updating to "local" side of the conflict: 26c7705fee96 |
| 105 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 105 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 106 nothing changed | 106 nothing changed |
| 107 working directory is now at 26c7705fee96 | 107 working directory is now at 26c7705fee96 |
| 108 | 108 |
| 109 Test None docstring issue of evolve divergent, which caused hg crush | 109 Test None docstring issue of evolve divergent, which caused hg crush |