Mercurial > evolve
comparison tests/test-evolve-content-divergence.t @ 4173:e268f7fd7839 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 12 Oct 2018 15:15:09 +0200 |
| parents | d00f0c369bc7 e541acefbaa5 |
| children | e07e764c0f48 04aeaec6ec07 |
comparison
equal
deleted
inserted
replaced
| 4172:35c21ab64420 | 4173:e268f7fd7839 |
|---|---|
| 32 | 32 |
| 33 Creating content-divergence with branch change where base, divergent and other | 33 Creating content-divergence with branch change where base, divergent and other |
| 34 have different branches | 34 have different branches |
| 35 ------------------------------------------------------------------------------- | 35 ------------------------------------------------------------------------------- |
| 36 | 36 |
| 37 $ hg branch -r . foobar | 37 $ hg branch foobar |
| 38 changed branch on 1 changesets | 38 marked working directory as branch foobar |
| 39 (branches are permanent and global, did you want a bookmark?) | |
| 40 $ hg amend | |
| 39 | 41 |
| 40 $ hg up c41c793e0ef1 --hidden | 42 $ hg up c41c793e0ef1 --hidden |
| 41 updating to a hidden changeset c41c793e0ef1 | |
| 42 (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48) | |
| 43 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 43 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 44 working directory parent is obsolete! (c41c793e0ef1) | 44 working directory parent is obsolete! (c41c793e0ef1) |
| 45 (use 'hg evolve' to update to its successor: 9e5dffcb3d48) | 45 (use 'hg evolve' to update to its successor: bdeedce1f621) |
| 46 $ echo bar > d | 46 $ echo bar > d |
| 47 $ hg branch watwat | 47 $ hg branch watwat |
| 48 marked working directory as branch watwat | 48 marked working directory as branch watwat |
| 49 $ hg amend | 49 $ hg amend |
| 50 2 new content-divergent changesets | 50 2 new content-divergent changesets |
| 51 | 51 |
| 52 $ hg glog | 52 $ hg glog |
| 53 @ 6:264b04f771fb added d | 53 @ 6:264b04f771fb added d |
| 54 | () [watwat] draft | 54 | () [watwat] draft |
| 55 | * 5:9e5dffcb3d48 added d | 55 | o 5:bdeedce1f621 added d |
| 56 |/ () [foobar] draft | 56 |/ () [foobar] draft |
| 57 o 3:ca1b80f7960a added c | 57 o 3:ca1b80f7960a added c |
| 58 | () [default] draft | 58 | () [default] draft |
| 59 o 2:b1661037fa25 added b | 59 o 2:b1661037fa25 added b |
| 60 | () [default] draft | 60 | () [default] draft |
| 67 > c | 67 > c |
| 68 > EOF | 68 > EOF |
| 69 merge:[6] added d | 69 merge:[6] added d |
| 70 with: [5] added d | 70 with: [5] added d |
| 71 base: [4] added d | 71 base: [4] added d |
| 72 merging "other" content-divergent changeset '9e5dffcb3d48' | 72 merging "other" content-divergent changeset 'bdeedce1f621' |
| 73 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 73 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 74 content divergent changesets on different branches. | 74 content divergent changesets on different branches. |
| 75 choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar? c | 75 choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar? c |
| 76 working directory is now at 0ac42f1bc15c | 76 working directory is now at 0ac42f1bc15c |
| 77 | 77 |
| 107 2 new content-divergent changesets | 107 2 new content-divergent changesets |
| 108 | 108 |
| 109 $ hg glog | 109 $ hg glog |
| 110 @ 9:59081c9c425a added a d with bar in it, expect some beers | 110 @ 9:59081c9c425a added a d with bar in it, expect some beers |
| 111 | () [default] draft | 111 | () [default] draft |
| 112 | * 8:f621d00f5f0e added d | 112 | o 8:f621d00f5f0e added d |
| 113 |/ () [foobar] draft | 113 |/ () [foobar] draft |
| 114 o 3:ca1b80f7960a added c | 114 o 3:ca1b80f7960a added c |
| 115 | () [default] draft | 115 | () [default] draft |
| 116 o 2:b1661037fa25 added b | 116 o 2:b1661037fa25 added b |
| 117 | () [default] draft | 117 | () [default] draft |
| 144 | 144 |
| 145 $ echo foo > d | 145 $ echo foo > d |
| 146 $ hg amend -m "foo to d" | 146 $ hg amend -m "foo to d" |
| 147 | 147 |
| 148 $ hg up a9d6fd6b5e40 --hidden | 148 $ hg up a9d6fd6b5e40 --hidden |
| 149 updating to a hidden changeset a9d6fd6b5e40 | |
| 150 (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1) | |
| 151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 149 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 152 working directory parent is obsolete! (a9d6fd6b5e40) | 150 working directory parent is obsolete! (a9d6fd6b5e40) |
| 153 (use 'hg evolve' to update to its successor: b10b07a394f1) | 151 (use 'hg evolve' to update to its successor: b10b07a394f1) |
| 154 $ echo babar > d | 152 $ echo babar > d |
| 155 $ hg amend -m "foo to d" | 153 $ hg amend -m "foo to d" |
| 156 2 new content-divergent changesets | 154 2 new content-divergent changesets |
| 157 | 155 |
| 158 $ hg glog | 156 $ hg glog |
| 159 @ 12:0bb497fed24a foo to d | 157 @ 12:0bb497fed24a foo to d |
| 160 | () [default] draft | 158 | () [default] draft |
| 161 | * 11:b10b07a394f1 foo to d | 159 | o 11:b10b07a394f1 foo to d |
| 162 |/ () [default] draft | 160 |/ () [default] draft |
| 163 o 3:ca1b80f7960a added c | 161 o 3:ca1b80f7960a added c |
| 164 | () [default] draft | 162 | () [default] draft |
| 165 o 2:b1661037fa25 added b | 163 o 2:b1661037fa25 added b |
| 166 | () [default] draft | 164 | () [default] draft |
| 204 | 202 |
| 205 $ echo bar > d | 203 $ echo bar > d |
| 206 $ hg amend -m "bar to d, expect beers" | 204 $ hg amend -m "bar to d, expect beers" |
| 207 | 205 |
| 208 $ hg up 11175423b5dc --hidden | 206 $ hg up 11175423b5dc --hidden |
| 209 updating to a hidden changeset 11175423b5dc | |
| 210 (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a) | |
| 211 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 207 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 212 working directory parent is obsolete! (11175423b5dc) | 208 working directory parent is obsolete! (11175423b5dc) |
| 213 (use 'hg evolve' to update to its successor: 27f0463f169a) | 209 (use 'hg evolve' to update to its successor: 27f0463f169a) |
| 214 $ echo wat > d | 210 $ echo wat > d |
| 215 $ hg amend -m "wat to d, wat?" | 211 $ hg amend -m "wat to d, wat?" |
| 216 2 new content-divergent changesets | 212 2 new content-divergent changesets |
| 217 | 213 |
| 218 $ hg glog | 214 $ hg glog |
| 219 @ 15:f542037ddf31 wat to d, wat? | 215 @ 15:f542037ddf31 wat to d, wat? |
| 220 | () [default] draft | 216 | () [default] draft |
| 221 | * 14:27f0463f169a bar to d, expect beers | 217 | o 14:27f0463f169a bar to d, expect beers |
| 222 |/ () [default] draft | 218 |/ () [default] draft |
| 223 o 3:ca1b80f7960a added c | 219 o 3:ca1b80f7960a added c |
| 224 | () [default] draft | 220 | () [default] draft |
| 225 o 2:b1661037fa25 added b | 221 o 2:b1661037fa25 added b |
| 226 | () [default] draft | 222 | () [default] draft |
| 316 $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True | 312 $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True |
| 317 rebasing 2:b1661037fa25 "added b" | 313 rebasing 2:b1661037fa25 "added b" |
| 318 2 new content-divergent changesets | 314 2 new content-divergent changesets |
| 319 | 315 |
| 320 $ hg glog | 316 $ hg glog |
| 321 * 6:da4b96f4a8d6 added b | 317 o 6:da4b96f4a8d6 added b |
| 322 | () [default] draft | 318 | () [default] draft |
| 323 | @ 5:7ed0642d644b added b | 319 | @ 5:7ed0642d644b added b |
| 324 | | () [default] draft | 320 | | () [default] draft |
| 325 | | * 4:c41c793e0ef1 added d | 321 | | o 4:c41c793e0ef1 added d |
| 326 | | | () [default] draft | 322 | | | () [default] draft |
| 327 | | * 3:ca1b80f7960a added c | 323 | | o 3:ca1b80f7960a added c |
| 328 | | | () [default] draft | 324 | | | () [default] draft |
| 329 | | x 2:b1661037fa25 added b | 325 | | x 2:b1661037fa25 added b |
| 330 | |/ () [default] draft | 326 | |/ () [default] draft |
| 331 | o 1:c7586e2a9264 added a | 327 | o 1:c7586e2a9264 added a |
| 332 |/ () [default] draft | 328 |/ () [default] draft |
| 344 working directory is now at 171614c9a791 | 340 working directory is now at 171614c9a791 |
| 345 | 341 |
| 346 $ hg glog | 342 $ hg glog |
| 347 @ 8:171614c9a791 added b | 343 @ 8:171614c9a791 added b |
| 348 | () [default] draft | 344 | () [default] draft |
| 349 | * 4:c41c793e0ef1 added d | 345 | o 4:c41c793e0ef1 added d |
| 350 | | () [default] draft | 346 | | () [default] draft |
| 351 | * 3:ca1b80f7960a added c | 347 | o 3:ca1b80f7960a added c |
| 352 | | () [default] draft | 348 | | () [default] draft |
| 353 | x 2:b1661037fa25 added b | 349 | x 2:b1661037fa25 added b |
| 354 |/ () [default] draft | 350 |/ () [default] draft |
| 355 o 1:c7586e2a9264 added a | 351 o 1:c7586e2a9264 added a |
| 356 | () [default] draft | 352 | () [default] draft |
| 407 marked working directory as branch bar | 403 marked working directory as branch bar |
| 408 (branches are permanent and global, did you want a bookmark?) | 404 (branches are permanent and global, did you want a bookmark?) |
| 409 $ hg amend -m "added foo to x" | 405 $ hg amend -m "added foo to x" |
| 410 | 406 |
| 411 $ hg up 71a392c714b5 --hidden | 407 $ hg up 71a392c714b5 --hidden |
| 412 updating to a hidden changeset 71a392c714b5 | |
| 413 (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d) | |
| 414 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 408 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 415 working directory parent is obsolete! (71a392c714b5) | 409 working directory parent is obsolete! (71a392c714b5) |
| 416 (use 'hg evolve' to update to its successor: 1e1a50385a7d) | 410 (use 'hg evolve' to update to its successor: 1e1a50385a7d) |
| 417 $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True | 411 $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True |
| 418 rebasing 11:71a392c714b5 "added x" | 412 rebasing 11:71a392c714b5 "added x" |
| 419 2 new content-divergent changesets | 413 2 new content-divergent changesets |
| 420 | 414 |
| 421 $ hg glog | 415 $ hg glog |
| 422 @ 13:1e4f6b3bb39b added x | 416 @ 13:1e4f6b3bb39b added x |
| 423 | () [default] draft | 417 | () [default] draft |
| 424 | * 12:1e1a50385a7d added foo to x | 418 | o 12:1e1a50385a7d added foo to x |
| 425 | | () [bar] draft | 419 | | () [bar] draft |
| 426 o | 10:4ae4427ee9f8 added d | 420 o | 10:4ae4427ee9f8 added d |
| 427 | | () [default] draft | 421 | | () [default] draft |
| 428 o | 9:917281f93fcb added c | 422 o | 9:917281f93fcb added c |
| 429 |/ () [default] draft | 423 |/ () [default] draft |
| 492 | 486 |
| 493 $ echo bar > y | 487 $ echo bar > y |
| 494 $ hg amend | 488 $ hg amend |
| 495 | 489 |
| 496 $ hg up fc6ad2bac162 --hidden | 490 $ hg up fc6ad2bac162 --hidden |
| 497 updating to a hidden changeset fc6ad2bac162 | |
| 498 (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba) | |
| 499 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 491 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 500 working directory parent is obsolete! (fc6ad2bac162) | 492 working directory parent is obsolete! (fc6ad2bac162) |
| 501 (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) | 493 (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) |
| 502 $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True | 494 $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True |
| 503 rebasing 16:fc6ad2bac162 "added y" | 495 rebasing 16:fc6ad2bac162 "added y" |
| 506 $ hg amend | 498 $ hg amend |
| 507 | 499 |
| 508 $ hg glog | 500 $ hg glog |
| 509 @ 19:b4575ed6fcfc added y | 501 @ 19:b4575ed6fcfc added y |
| 510 | () [bar] draft | 502 | () [bar] draft |
| 511 | * 17:2a9f6ccbdeba added y | 503 | o 17:2a9f6ccbdeba added y |
| 512 | | () [default] draft | 504 | | () [default] draft |
| 513 o | 15:b006cf317e0e added foo to x | 505 o | 15:b006cf317e0e added foo to x |
| 514 | | () [bar] draft | 506 | | () [bar] draft |
| 515 o | 10:4ae4427ee9f8 added d | 507 o | 10:4ae4427ee9f8 added d |
| 516 | | () [default] draft | 508 | | () [default] draft |
| 627 $ echo foo > y | 619 $ echo foo > y |
| 628 $ hg add y | 620 $ hg add y |
| 629 $ hg amend | 621 $ hg amend |
| 630 | 622 |
| 631 $ hg up daf1de08f3b0 --hidden | 623 $ hg up daf1de08f3b0 --hidden |
| 632 updating to a hidden changeset daf1de08f3b0 | |
| 633 (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080) | |
| 634 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 624 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 635 working directory parent is obsolete! (daf1de08f3b0) | 625 working directory parent is obsolete! (daf1de08f3b0) |
| 636 (use 'hg evolve' to update to its successor: 3f7a1f693080) | 626 (use 'hg evolve' to update to its successor: 3f7a1f693080) |
| 637 $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True | 627 $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True |
| 638 rebasing 22:daf1de08f3b0 "added z" | 628 rebasing 22:daf1de08f3b0 "added z" |
| 641 $ hg amend | 631 $ hg amend |
| 642 | 632 |
| 643 $ hg glog | 633 $ hg glog |
| 644 @ 25:53242575ffa9 added z | 634 @ 25:53242575ffa9 added z |
| 645 | () [bar] draft | 635 | () [bar] draft |
| 646 | * 23:3f7a1f693080 added z | 636 | o 23:3f7a1f693080 added z |
| 647 | | () [default] draft | 637 | | () [default] draft |
| 648 o | 21:7bbcf24ddecf added y | 638 o | 21:7bbcf24ddecf added y |
| 649 | | () [bar] draft | 639 | | () [bar] draft |
| 650 o | 15:b006cf317e0e added foo to x | 640 o | 15:b006cf317e0e added foo to x |
| 651 | | () [bar] draft | 641 | | () [bar] draft |
| 862 adding changesets | 852 adding changesets |
| 863 adding manifests | 853 adding manifests |
| 864 adding file changes | 854 adding file changes |
| 865 added 4 changesets with 0 changes to 4 files (+1 heads) | 855 added 4 changesets with 0 changes to 4 files (+1 heads) |
| 866 5 new obsolescence markers | 856 5 new obsolescence markers |
| 867 8 new content-divergent changesets | |
| 868 new changesets 82b74d5dc678:15c781f93cac | 857 new changesets 82b74d5dc678:15c781f93cac |
| 869 (run 'hg heads' to see heads, 'hg merge' to merge) | 858 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 870 | 859 8 new content-divergent changesets |
| 871 $ hg glog | 860 |
| 872 * 12:15c781f93cac added d | 861 $ hg glog |
| 873 | () [default] draft | 862 o 12:15c781f93cac added d |
| 874 * 11:9e5fb1d5b955 added c | 863 | () [default] draft |
| 875 | () [default] draft | 864 o 11:9e5fb1d5b955 added c |
| 876 * 10:88516dccf68a added b | 865 | () [default] draft |
| 877 | () [default] draft | 866 o 10:88516dccf68a added b |
| 878 * 9:82b74d5dc678 watbar to a | 867 | () [default] draft |
| 868 o 9:82b74d5dc678 watbar to a | |
| 879 | () [default] draft | 869 | () [default] draft |
| 880 | @ 8:c72d2885eb51 added d | 870 | @ 8:c72d2885eb51 added d |
| 881 | | () [default] draft | 871 | | () [default] draft |
| 882 | * 7:3ce4be6d8e5e added c | 872 | o 7:3ce4be6d8e5e added c |
| 883 | | () [default] draft | 873 | | () [default] draft |
| 884 | * 6:d5f148423c16 added b | 874 | o 6:d5f148423c16 added b |
| 885 | | () [default] draft | 875 | | () [default] draft |
| 886 | * 5:8e222f257bbf watbar to a | 876 | o 5:8e222f257bbf watbar to a |
| 887 |/ () [default] draft | 877 |/ () [default] draft |
| 888 o 0:8fa14d15e168 added hgignore | 878 o 0:8fa14d15e168 added hgignore |
| 889 () [default] draft | 879 () [default] draft |
| 890 | 880 |
| 891 $ hg evolve --all --content-divergent | 881 $ hg evolve --all --content-divergent |
| 893 with: [9] watbar to a | 883 with: [9] watbar to a |
| 894 base: [1] added a | 884 base: [1] added a |
| 895 updating to "local" side of the conflict: 8e222f257bbf | 885 updating to "local" side of the conflict: 8e222f257bbf |
| 896 merging "other" content-divergent changeset '82b74d5dc678' | 886 merging "other" content-divergent changeset '82b74d5dc678' |
| 897 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 887 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 898 6 new orphan changesets | |
| 899 merge:[6] added b | 888 merge:[6] added b |
| 900 with: [10] added b | 889 with: [10] added b |
| 901 base: [2] added b | 890 base: [2] added b |
| 902 updating to "local" side of the conflict: d5f148423c16 | 891 updating to "local" side of the conflict: d5f148423c16 |
| 903 merging "other" content-divergent changeset '88516dccf68a' | 892 merging "other" content-divergent changeset '88516dccf68a' |