Mercurial > evolve
comparison tests/test-sharing.t @ 4483:7978230faa32 stable
evolve: make sure div resolution don't replace the initial author (issue6113)
Before this patch, divergence resolution logic taking the current user who
is running the resolution command as the author of commit that will
be created after merging the two divergent csets.
This patch make sure that we preserve the initial author.
Changes in test file reflect the fixed behaviour.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Wed, 10 Apr 2019 15:37:29 +0200 |
| parents | d02a7c8cdee5 |
| children | bdaf34903430 |
comparison
equal
deleted
inserted
replaced
| 4482:ee7e4e05ce44 | 4483:7978230faa32 |
|---|---|
| 515 merge:[5] fix bug 24 (v2 by bob) | 515 merge:[5] fix bug 24 (v2 by bob) |
| 516 with: [6] fix bug 24 (v2 by alice) | 516 with: [6] fix bug 24 (v2 by alice) |
| 517 base: [4] fix bug 24 (v1) | 517 base: [4] fix bug 24 (v1) |
| 518 merging "other" content-divergent changeset 'e3f99ce9d9cd' | 518 merging "other" content-divergent changeset 'e3f99ce9d9cd' |
| 519 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 519 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 520 working directory is now at 711ede2d7a26 | 520 working directory is now at b1499b0f03ca |
| 521 $ hg log -q -r 'contentdivergent()' | 521 $ hg log -q -r 'contentdivergent()' |
| 522 | 522 |
| 523 Figure SG10: Bob's repository after fixing divergence. | 523 Figure SG10: Bob's repository after fixing divergence. |
| 524 $ hg --hidden shortlog -G -r 3:: | 524 $ hg --hidden shortlog -G -r 3:: |
| 525 @ 7:711ede2d7a26 draft fix bug 24 (v2 by bob) | 525 @ 7:b1499b0f03ca draft fix bug 24 (v2 by bob) |
| 526 | | 526 | |
| 527 | x 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice) | 527 | x 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice) |
| 528 |/ | 528 |/ |
| 529 | x 5:a360947f6faf draft fix bug 24 (v2 by bob) | 529 | x 5:a360947f6faf draft fix bug 24 (v2 by bob) |
| 530 |/ | 530 |/ |
| 531 | x 4:2fe6c4bd32d0 draft fix bug 24 (v1) | 531 | x 4:2fe6c4bd32d0 draft fix bug 24 (v1) |
| 532 |/ | 532 |/ |
| 533 o 3:a06ec1bf97bd public fix bug 15 (v2) | 533 o 3:a06ec1bf97bd public fix bug 15 (v2) |
| 534 | | 534 | |
| 535 ~ | 535 ~ |
| 536 $ hg --hidden shortlog -r 'precursors(711ede2d7a26)' | 536 $ hg --hidden shortlog -r 'precursors(b1499b0f03ca)' |
| 537 5:a360947f6faf draft fix bug 24 (v2 by bob) | 537 5:a360947f6faf draft fix bug 24 (v2 by bob) |
| 538 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice) | 538 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice) |
| 539 $ cat file1 | 539 $ cat file1 |
| 540 Do stuff. | 540 Do stuff. |
| 541 pretty good fix | 541 pretty good fix |