Mercurial > evolve
comparison tests/test-evolve-public-content-divergent-discard.t @ 5857:b0b1ab64f6d8
public-content-divergence: early set the public one to local side
This change helps us to:
1. remove some check-ups which we had to perform later at the time of
merging the two (to make sure that public one is at local side).
2. make the status msgs consistent:
```
Merge:[public_rev] desc_1
with: [other_rev] desc_2
```
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Mon, 08 Mar 2021 17:45:57 +0530 |
| parents | 61d2f1cf90f0 |
| children | c0b439f14260 |
comparison
equal
deleted
inserted
replaced
| 5847:ad7c9c0b7a63 | 5857:b0b1ab64f6d8 |
|---|---|
| 87 | | 87 | |
| 88 o 0:9092f1db7931 added a | 88 o 0:9092f1db7931 added a |
| 89 public | 89 public |
| 90 | 90 |
| 91 $ hg evolve --content-divergent --any | 91 $ hg evolve --content-divergent --any |
| 92 merge:[3] added ch | 92 merge:[4] added c |
| 93 with: [4] added c | 93 with: [3] added ch |
| 94 base: [2] added c | 94 base: [2] added c |
| 95 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 95 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 96 other divergent changeset 90522bccf499 has same content as local f7c1071f1e7c and differs by "description" only, discarding 90522bccf499 | 96 other divergent changeset 90522bccf499 has same content as local f7c1071f1e7c and differs by "description" only, discarding 90522bccf499 |
| 97 content divergence resolution between f7c1071f1e7c (public) and 90522bccf499 has same content as f7c1071f1e7c, discarding 90522bccf499 | 97 content divergence resolution between f7c1071f1e7c (public) and 90522bccf499 has same content as f7c1071f1e7c, discarding 90522bccf499 |
| 98 | 98 |
| 178 | | 178 | |
| 179 o 0:9092f1db7931 added a | 179 o 0:9092f1db7931 added a |
| 180 public | 180 public |
| 181 | 181 |
| 182 $ hg evolve --content-divergent --any | 182 $ hg evolve --content-divergent --any |
| 183 merge:[4] added dh | 183 merge:[5] added d |
| 184 with: [5] added d | 184 with: [4] added dh |
| 185 base: [3] added d | 185 base: [3] added d |
| 186 rebasing "divergent" content-divergent changeset 5acd58ef5066 on 155349b645be | 186 rebasing "other" content-divergent changeset 5acd58ef5066 on 155349b645be |
| 187 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 187 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 188 other divergent changeset ae3429430ef1 has same content as local e800202333a4 and differs by "description" only, discarding ae3429430ef1 | 188 other divergent changeset ae3429430ef1 has same content as local e800202333a4 and differs by "description" only, discarding ae3429430ef1 |
| 189 content divergence resolution between e800202333a4 (public) and ae3429430ef1 has same content as e800202333a4, discarding ae3429430ef1 | 189 content divergence resolution between e800202333a4 (public) and ae3429430ef1 has same content as e800202333a4, discarding ae3429430ef1 |
| 190 | 190 |
| 191 $ hg evolve -l | 191 $ hg evolve -l |
| 263 | | 263 | |
| 264 o 0:9092f1db7931 added a | 264 o 0:9092f1db7931 added a |
| 265 public | 265 public |
| 266 | 266 |
| 267 $ hg evolve --content-divergent --any | 267 $ hg evolve --content-divergent --any |
| 268 merge:[3] added ch | 268 merge:[4] added c |
| 269 with: [4] added c | 269 with: [3] added ch |
| 270 base: [2] added c | 270 base: [2] added c |
| 271 merging ch | 271 merging ch |
| 272 warning: conflicts while merging ch! (edit, then use 'hg resolve --mark') | 272 warning: conflicts while merging ch! (edit, then use 'hg resolve --mark') |
| 273 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 273 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 274 unresolved merge conflicts | 274 unresolved merge conflicts |
| 377 | | 377 | |
| 378 o 0:9092f1db7931 added a | 378 o 0:9092f1db7931 added a |
| 379 public | 379 public |
| 380 | 380 |
| 381 $ hg evolve --content-divergent --any | 381 $ hg evolve --content-divergent --any |
| 382 merge:[4] added dh | 382 merge:[5] added d |
| 383 with: [5] added d | 383 with: [4] added dh |
| 384 base: [3] added d | 384 base: [3] added d |
| 385 rebasing "divergent" content-divergent changeset f89a8e2f86ac on 155349b645be | 385 rebasing "other" content-divergent changeset f89a8e2f86ac on 155349b645be |
| 386 merging c | 386 merging c |
| 387 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 387 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 388 unresolved merge conflicts | 388 unresolved merge conflicts |
| 389 (see 'hg help evolve.interrupted') | 389 (see 'hg help evolve.interrupted') |
| 390 [240] | 390 [240] |
| 481 | | 481 | |
| 482 o 0:9092f1db7931 added a | 482 o 0:9092f1db7931 added a |
| 483 public | 483 public |
| 484 | 484 |
| 485 $ hg evolve --content-divergent --any | 485 $ hg evolve --content-divergent --any |
| 486 merge:[4] added dh | 486 merge:[5] added d |
| 487 with: [5] added d | 487 with: [4] added dh |
| 488 base: [3] added d | 488 base: [3] added d |
| 489 rebasing "divergent" content-divergent changeset db0b7bba0aae on 155349b645be | 489 rebasing "other" content-divergent changeset db0b7bba0aae on 155349b645be |
| 490 merging dh | 490 merging dh |
| 491 warning: conflicts while merging dh! (edit, then use 'hg resolve --mark') | 491 warning: conflicts while merging dh! (edit, then use 'hg resolve --mark') |
| 492 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 492 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 493 unresolved merge conflicts | 493 unresolved merge conflicts |
| 494 (see 'hg help evolve.interrupted') | 494 (see 'hg help evolve.interrupted') |
| 585 | | 585 | |
| 586 o 0:9092f1db7931 added a | 586 o 0:9092f1db7931 added a |
| 587 public | 587 public |
| 588 | 588 |
| 589 $ hg evolve --content-divergent --any | 589 $ hg evolve --content-divergent --any |
| 590 merge:[4] added dh | 590 merge:[5] added d |
| 591 with: [5] added d | 591 with: [4] added dh |
| 592 base: [3] added d | 592 base: [3] added d |
| 593 rebasing "divergent" content-divergent changeset 67b19bbd770f on 155349b645be | 593 rebasing "other" content-divergent changeset 67b19bbd770f on 155349b645be |
| 594 merging c | 594 merging c |
| 595 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 595 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 596 unresolved merge conflicts | 596 unresolved merge conflicts |
| 597 (see 'hg help evolve.interrupted') | 597 (see 'hg help evolve.interrupted') |
| 598 [240] | 598 [240] |