Mercurial > evolve
comparison tests/test-evolve-public-content-divergent-corner-cases.t @ 6396:e5bd76f95145 mercurial-5.5
test-compat: merge mercurial-5.6 into mercurial-5.5
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Mon, 06 Feb 2023 21:38:31 +0400 |
| parents | 1328195f76a9 |
| children | 716912541759 |
comparison
equal
deleted
inserted
replaced
| 6350:0aff320554d2 | 6396:e5bd76f95145 |
|---|---|
| 135 merge:[4] added c | 135 merge:[4] added c |
| 136 with: [5] updated c | 136 with: [5] updated c |
| 137 base: [2] added c | 137 base: [2] added c |
| 138 rebasing "other" content-divergent changeset f5f9b4fc8b77 on c9241b0f2d5b | 138 rebasing "other" content-divergent changeset f5f9b4fc8b77 on c9241b0f2d5b |
| 139 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 139 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 140 committed as 0941937e8302 | 140 committed as a3019c73de83 |
| 141 working directory is now at 0941937e8302 | 141 working directory is now at a3019c73de83 |
| 142 | 142 |
| 143 $ hg glog -p | 143 $ hg glog -p |
| 144 @ 8:0941937e8302 phase-divergent update to c0d7ee6604ea: | 144 @ 8:a3019c73de83 phase-divergent update to c0d7ee6604ea: |
| 145 | draft | 145 | draft |
| 146 | | 146 | |
| 147 | diff -r c0d7ee6604ea -r 0941937e8302 c | 147 | diff -r c0d7ee6604ea -r a3019c73de83 c |
| 148 | --- a/c Thu Jan 01 00:00:00 1970 +0000 | 148 | --- a/c Thu Jan 01 00:00:00 1970 +0000 |
| 149 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 | 149 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
| 150 | @@ -1,1 +1,2 @@ | 150 | @@ -1,1 +1,2 @@ |
| 151 | c | 151 | c |
| 152 | +cc | 152 | +cc |
| 430 [1] | 430 [1] |
| 431 | 431 |
| 432 $ hg sum | 432 $ hg sum |
| 433 parent: 5:93cd84bbdaca | 433 parent: 5:93cd84bbdaca |
| 434 added d | 434 added d |
| 435 parent: 6:2af3359250d3 tip (content-divergent) | 435 parent: 6:cf77846279b4 tip (content-divergent) |
| 436 added c e | 436 added c e |
| 437 branch: default | 437 branch: default |
| 438 commit: 1 modified, 1 unknown, 1 unresolved (merge) | 438 commit: 1 modified, 1 unknown, 1 unresolved (merge) |
| 439 update: (current) | 439 update: (current) |
| 440 phases: 1 draft | 440 phases: 1 draft |
| 445 $ hg resolve -m d | 445 $ hg resolve -m d |
| 446 (no more unresolved files) | 446 (no more unresolved files) |
| 447 continue: hg evolve --continue | 447 continue: hg evolve --continue |
| 448 | 448 |
| 449 $ hg evolve --continue | 449 $ hg evolve --continue |
| 450 committed as bb4d94ae1a5a | 450 committed as 01169b149789 |
| 451 working directory is now at bb4d94ae1a5a | 451 working directory is now at 01169b149789 |
| 452 | 452 |
| 453 $ hg export | 453 $ hg export |
| 454 # HG changeset patch | 454 # HG changeset patch |
| 455 # User test | 455 # User test |
| 456 # Date 0 0 | 456 # Date 0 0 |
| 457 # Thu Jan 01 00:00:00 1970 +0000 | 457 # Thu Jan 01 00:00:00 1970 +0000 |
| 458 # Node ID bb4d94ae1a5ac031ba524ef30850f32b9b50a560 | 458 # Node ID 01169b149789f09d81f86d5273e56671ab645590 |
| 459 # Parent 93cd84bbdacaeb8f881c29a609dbdd30c38cbc57 | 459 # Parent 93cd84bbdacaeb8f881c29a609dbdd30c38cbc57 |
| 460 phase-divergent update to 93cd84bbdaca: | 460 phase-divergent update to 93cd84bbdaca: |
| 461 | 461 |
| 462 added c e | 462 added c e |
| 463 | 463 |
| 464 diff -r 93cd84bbdaca -r bb4d94ae1a5a d | 464 diff -r 93cd84bbdaca -r 01169b149789 d |
| 465 --- a/d Thu Jan 01 00:00:00 1970 +0000 | 465 --- a/d Thu Jan 01 00:00:00 1970 +0000 |
| 466 +++ b/d Thu Jan 01 00:00:00 1970 +0000 | 466 +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
| 467 @@ -1,1 +1,1 @@ | 467 @@ -1,1 +1,1 @@ |
| 468 -dd | 468 -dd |
| 469 +resolved | 469 +resolved |
| 470 diff -r 93cd84bbdaca -r bb4d94ae1a5a e | 470 diff -r 93cd84bbdaca -r 01169b149789 e |
| 471 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | 471 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| 472 +++ b/e Thu Jan 01 00:00:00 1970 +0000 | 472 +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
| 473 @@ -0,0 +1,1 @@ | 473 @@ -0,0 +1,1 @@ |
| 474 +e | 474 +e |
| 475 | 475 |