Mercurial > evolve
comparison tests/test-evolve-public-content-divergent-corner-cases.t @ 5747:8e4f6354b316 mercurial-5.6
tests: back out changeset b3d9e6c805d6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 28 Jan 2021 18:48:36 +0800 |
| parents | e5d91fd1f319 |
| children | 03410b04cf10 |
comparison
equal
deleted
inserted
replaced
| 5746:feb28638ec6c | 5747:8e4f6354b316 |
|---|---|
| 394 rebasing "divergent" content-divergent changeset e568fd1029bb on 155349b645be | 394 rebasing "divergent" content-divergent changeset e568fd1029bb on 155349b645be |
| 395 merging c | 395 merging c |
| 396 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 396 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 397 unresolved merge conflicts | 397 unresolved merge conflicts |
| 398 (see 'hg help evolve.interrupted') | 398 (see 'hg help evolve.interrupted') |
| 399 [240] | 399 [1] |
| 400 | 400 |
| 401 $ hg diff | 401 $ hg diff |
| 402 diff -r 155349b645be c | 402 diff -r 155349b645be c |
| 403 --- a/c Thu Jan 01 00:00:00 1970 +0000 | 403 --- a/c Thu Jan 01 00:00:00 1970 +0000 |
| 404 +++ b/c Thu Jan 01 00:00:00 1970 +0000 | 404 +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
| 425 You can use (c)hanged version, (d)elete, or leave (u)nresolved. | 425 You can use (c)hanged version, (d)elete, or leave (u)nresolved. |
| 426 What do you want to do? u | 426 What do you want to do? u |
| 427 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | 427 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 428 unresolved merge conflicts | 428 unresolved merge conflicts |
| 429 (see 'hg help evolve.interrupted') | 429 (see 'hg help evolve.interrupted') |
| 430 [240] | 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:2af3359250d3 tip (content-divergent) |