Mercurial > evolve
comparison tests/test-evolve-content-divergent-stack.t @ 5016:64868b7dc112
evolve: add logic to cover --continue case when relocating "divergent"
Changes in test file demonstrate the added behaviour.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Wed, 27 Nov 2019 12:34:19 +0530 |
| parents | 43f4784a3f21 |
| children | f1e90ce1d372 |
comparison
equal
deleted
inserted
replaced
| 5015:43f4784a3f21 | 5016:64868b7dc112 |
|---|---|
| 387 | 387 |
| 388 $ echo b > b | 388 $ echo b > b |
| 389 $ hg res -m | 389 $ hg res -m |
| 390 (no more unresolved files) | 390 (no more unresolved files) |
| 391 continue: hg evolve --continue | 391 continue: hg evolve --continue |
| 392 $ hg evolve --continue 2>&1 | grep "KeyError" | 392 $ hg evolve --continue |
| 393 KeyError: 'resolutionparent' | 393 evolving 11:6eb54b5af3fb "added b" |
| 394 rebasing "other" content-divergent changeset d5f148423c16 on 119989a4317e | |
| 395 merging b | |
| 396 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | |
| 397 unresolved merge conflicts | |
| 398 (see 'hg help evolve.interrupted') | |
| 399 [1] | |
| 400 | |
| 401 $ echo b > b | |
| 402 $ hg res -m | |
| 403 (no more unresolved files) | |
| 404 continue: hg evolve --continue | |
| 405 $ hg evolve --continue | |
| 406 evolving 6:d5f148423c16 "added b" | |
| 407 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 408 merge:[12] added c | |
| 409 with: [7] added c | |
| 410 base: [3] added c | |
| 411 rebasing "divergent" content-divergent changeset 8ed612937375 on 646bd3372ee7 | |
| 412 rebasing "other" content-divergent changeset 3ce4be6d8e5e on 646bd3372ee7 | |
| 413 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 414 merge:[13] added d | |
| 415 with: [8] added d | |
| 416 base: [4] added d | |
| 417 rebasing "divergent" content-divergent changeset d45f050514c2 on 67abc597e636 | |
| 418 rebasing "other" content-divergent changeset c72d2885eb51 on 67abc597e636 | |
| 419 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 420 working directory is now at 119989a4317e | |
| 421 $ hg glog | |
| 422 o 25:5e2572194f59 added d | |
| 423 | () [default] draft | |
| 424 o 22:67abc597e636 added c | |
| 425 | () [default] draft | |
| 426 o 19:646bd3372ee7 added b | |
| 427 | () [default] draft | |
| 428 @ 16:119989a4317e watbar to a | |
| 429 | () [default] draft | |
| 430 o 9:2228e3b74514 add newfile | |
| 431 | () [default] draft | |
| 432 o 0:8fa14d15e168 added hgignore | |
| 433 () [default] draft | |
| 394 | 434 |
| 395 $ cd .. | 435 $ cd .. |
| 396 | 436 |
| 397 Make sure that content-divergent resolution doesn't undo a change (issue6203) | 437 Make sure that content-divergent resolution doesn't undo a change (issue6203) |
| 398 ----------------------------------------------------------------------------- | 438 ----------------------------------------------------------------------------- |