Mercurial > evolve
comparison tests/test-evolve-public-content-divergent.t @ 4413:2360a1e050a6
evolve: pin the public cset to local side in merging when solving public div
While working on public divergence, I think it would be better to pin
the public cset to local side of merge for understanding and handling
the future cases without any ambiguity.
Changes in tests reflect the changed behaviour.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Mon, 25 Feb 2019 22:50:24 +0530 |
| parents | dcbe64c954dc |
| children | b2a8e67b0933 |
comparison
equal
deleted
inserted
replaced
| 4412:dcbe64c954dc | 4413:2360a1e050a6 |
|---|---|
| 61 | 61 |
| 62 | 62 |
| 63 Lets resolve the public content-divergence: | 63 Lets resolve the public content-divergence: |
| 64 | 64 |
| 65 $ hg evolve --content-divergent | 65 $ hg evolve --content-divergent |
| 66 merge:[3] updated b | 66 merge:[2] added b |
| 67 with: [2] added b | 67 with: [3] updated b |
| 68 base: [1] added b | 68 base: [1] added b |
| 69 merging "other" content-divergent changeset '44f360db368f' | 69 updating to "local" side of the conflict: 44f360db368f |
| 70 merging "other" content-divergent changeset 'dcdaf152280a' | |
| 70 merging b | 71 merging b |
| 71 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 72 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 72 computing new diff | 73 computing new diff |
| 73 committed as c1aa9cfb6cf8 | 74 committed as c1aa9cfb6cf8 |
| 74 working directory is now at c1aa9cfb6cf8 | 75 working directory is now at c1aa9cfb6cf8 |
| 158 | 159 |
| 159 | 160 |
| 160 Lets resolve the divergence: | 161 Lets resolve the divergence: |
| 161 | 162 |
| 162 $ hg evolve --content-divergent | 163 $ hg evolve --content-divergent |
| 163 merge:[3] updated b | 164 merge:[2] added b |
| 164 with: [2] added b | 165 with: [3] updated b |
| 165 base: [1] added b | 166 base: [1] added b |
| 166 merging "other" content-divergent changeset '580f2d01e52c' | 167 updating to "local" side of the conflict: 580f2d01e52c |
| 168 merging "other" content-divergent changeset '0e805383168e' | |
| 167 merging b | 169 merging b |
| 168 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | 170 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
| 169 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 171 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 170 fix conflicts and see `hg help evolve.interrupted` | 172 fix conflicts and see `hg help evolve.interrupted` |
| 171 [1] | 173 [1] |