Mercurial > evolve
changeset 4081:20dcc92c285f mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 03 Sep 2018 22:59:19 +0200 |
| parents | f9a850018daa (diff) 7567b58390d7 (current diff) |
| children | 185770c10a4e 5b35899b9173 |
| files | tests/test-evolve-issue5832.t tests/test-grab.t |
| diffstat | 74 files changed, 320 insertions(+), 634 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-discovery-obshashrange.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-discovery-obshashrange.t Mon Sep 03 22:59:19 2018 +0200 @@ -314,61 +314,17 @@ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e exited 0 after *.?? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push -f --debug (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> running python "*/dummyssh" *user@dummy* *hg -R server serve --stdio* (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending hello command (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending between command (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: * (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset getbundle known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: 1 (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> preparing listkeys for "phases" (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending listkeys command (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> received listkey for "phases": 58 bytes (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> query 1; heads (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending batch command (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> taking quick initial sample (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> query 2; still undecided: 5, sample size is: 5 (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending known command (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> 2 total queries in *.????s (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> found 1 common and 1 unknown server heads, 2 roundtrips in *.????s (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> preparing listkeys for "phases" (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending listkeys command (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> received listkey for "phases": 58 bytes (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> preparing listkeys for "namespaces" (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending listkeys command (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> received listkey for "namespaces": 40 bytes (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-stablerange-mergepoint cache reset (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-depthcache cache reset (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-depthcache in *.???? seconds (6r) (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-stablerange-mergepoint in *.???? seconds (6r) (glob) - 1970/01/01 00:00:00 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obshashrange in *.???? seconds (6r, 4o) (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> query 0; add more sample (target 100, current 1) (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> query 0; sample size is 9, largest range 5 (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending evoext_obshashrange_v1 command (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obshashrange in *.???? seconds (6r, 4o) (glob) 1970/01/01 00:00:00 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-stablesort cache reset (glob) 1970/01/01 00:00:00 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-stablesort in *.???? seconds (6r) (glob) 1970/01/01 00:00:00 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-firstmerge cache reset (glob) 1970/01/01 00:00:00 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-firstmerge in *.???? seconds (6r) (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 0/5 mismatch - 1 obshashrange queries in *.???? seconds (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 0/5 mismatch - 1 obshashrange queries in *.???? seconds (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> checking for updated bookmarks (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> preparing listkeys for "bookmarks" (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending listkeys command (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> received listkey for "bookmarks": 0 bytes (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> list of changesets: (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> 45f8b879de922f6a6e620ba04205730335b6fc7e (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending unbundle command (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-output-bundle: "HG20", 4 parts total (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-output-part: "replycaps" * bytes payload (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-output-part: "phase-heads" 24 bytes payload (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-output-part: "obsmarkers" streamed payload (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-bundle: no-transaction (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-bundle: 1 parts total (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> preparing listkeys for "phases" (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending listkeys command (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> received listkey for "phases": 58 bytes (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push -f --debug exited 0 after *.?? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> log -G (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> writing .hg/cache/tags2-visible with 0 tags (glob) @@ -997,7 +953,7 @@ $ hg --config extensions.strip= strip -r 'desc("foo")' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - saved backup bundle to $TESTTMP/client/.hg/strip-backup/45f8b879de92-94c82517-backup.hg + saved backup bundle to $TESTTMP/client/.hg/strip-backup/45f8b879de92-94c82517-backup.hg (glob) $ hg log -G o 7 4de32a90b66c r7 tip |
--- a/tests/test-divergent.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-divergent.t Mon Sep 03 22:59:19 2018 +0200 @@ -60,7 +60,7 @@ $ hg log -G @ 3:8374d2ddc3a4@default(draft) divergent [content-divergent] | - | * 2:593c57f2117e@default(draft) divergent [content-divergent] + | o 2:593c57f2117e@default(draft) divergent [content-divergent] |/ o 0:9092f1db7931@default(draft) added a [] @@ -120,7 +120,7 @@ $ hg log -G @ 7:b2ae71172042@default(draft) add _c [content-divergent] | - | * 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] + | o 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent] |/ | o 4:45bf1312f454@default(draft) divergent [] |/ @@ -176,7 +176,7 @@ $ hg log -G @ 3:6b096fb45070@default(draft) bdivergent [content-divergent] | - | * 2:05a6b6a9e633@default(draft) bdivergent [content-divergent] + | o 2:05a6b6a9e633@default(draft) bdivergent [content-divergent] |/ o 0:135f39f4bd78@default(draft) add _a []
--- a/tests/test-evolve-abort-contentdiv.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-abort-contentdiv.t Mon Sep 03 22:59:19 2018 +0200 @@ -45,8 +45,6 @@ $ hg amend $ hg up c41c793e0ef1 --hidden - updating to a hidden changeset c41c793e0ef1 - (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (c41c793e0ef1) (use 'hg evolve' to update to its successor: e49523854bc8) @@ -57,7 +55,7 @@ $ hg glog --hidden @ 6:9c1631e352d9 added d | () draft - | * 5:e49523854bc8 added d + | o 5:e49523854bc8 added d |/ () draft | x 4:c41c793e0ef1 added d |/ () draft @@ -120,7 +118,7 @@ $ hg glog --hidden @ 6:9c1631e352d9 added d | () draft - | * 5:e49523854bc8 added d + | o 5:e49523854bc8 added d |/ () draft | x 4:c41c793e0ef1 added d |/ () draft @@ -159,13 +157,13 @@ | () draft | x 9:7398f702a162 added c |/ () draft - | * 8:2ba73e31f264 added c + | o 8:2ba73e31f264 added c |/ () draft - | * 7:f0f1694f123e added d + | o 7:f0f1694f123e added d | | () draft | | x 6:9c1631e352d9 added d | |/ () draft - | | * 5:e49523854bc8 added d + | | o 5:e49523854bc8 added d | |/ () draft | | x 4:c41c793e0ef1 added d | |/ () draft @@ -197,7 +195,6 @@ [1] $ hg evolve --abort - 2 new content-divergent changesets evolve aborted working directory is now at 491e10505bae @@ -206,13 +203,13 @@ | () draft | x 9:7398f702a162 added c |/ () draft - | * 8:2ba73e31f264 added c + | o 8:2ba73e31f264 added c |/ () draft - | * 7:f0f1694f123e added d + | o 7:f0f1694f123e added d | | () draft | | x 6:9c1631e352d9 added d | |/ () draft - | | * 5:e49523854bc8 added d + | | o 5:e49523854bc8 added d | |/ () draft | | x 4:c41c793e0ef1 added d | |/ () draft @@ -226,7 +223,7 @@ () draft $ hg obslog -r . --all - * 2ba73e31f264 (8) added c + o 2ba73e31f264 (8) added c | | @ 491e10505bae (10) added c | | @@ -269,8 +266,6 @@ $ hg amend $ hg up --hidden c41c793e0ef1 - updating to a hidden changeset c41c793e0ef1 - (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (c41c793e0ef1) (use 'hg evolve' to update to its successor: 69bdd23a9b0d) @@ -281,7 +276,7 @@ $ hg glog @ 7:e49523854bc8 added d | () draft - | * 6:69bdd23a9b0d added d + | o 6:69bdd23a9b0d added d | | () draft o | 3:ca1b80f7960a added c | | () draft @@ -309,7 +304,7 @@ $ hg glog @ 7:e49523854bc8 added d | () draft - | * 6:69bdd23a9b0d added d + | o 6:69bdd23a9b0d added d | | () draft o | 3:ca1b80f7960a added c | | () draft @@ -333,7 +328,7 @@ $ hg glog @ 8:33e4442acf98 added d | () draft - | * 7:e49523854bc8 added d + | o 7:e49523854bc8 added d | | () draft | o 3:ca1b80f7960a added c | | () draft @@ -364,7 +359,7 @@ $ hg glog @ 8:33e4442acf98 added d | () draft - | * 7:e49523854bc8 added d + | o 7:e49523854bc8 added d | | () draft | o 3:ca1b80f7960a added c | | () draft
--- a/tests/test-evolve-abort-orphan.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-abort-orphan.t Mon Sep 03 22:59:19 2018 +0200 @@ -110,7 +110,7 @@ $ hg glog @ 5:e93a9161a274 added c | () draft - | * 4:c41c793e0ef1 added d + | o 4:c41c793e0ef1 added d | | () draft | x 3:ca1b80f7960a added c |/ () draft @@ -186,7 +186,7 @@ | () draft o 7:125af0ed8cae added a | () draft - | * 6:e83de241f751 added d + | o 6:e83de241f751 added d | | () draft | @ 5:e93a9161a274 added c | | () draft @@ -198,18 +198,17 @@ () draft $ hg evolve --abort - 1 new orphan changesets evolve aborted working directory is now at 125af0ed8cae $ hg glog @ 7:125af0ed8cae added a | () draft - | * 6:e83de241f751 added d + | o 6:e83de241f751 added d | | () draft - | * 5:e93a9161a274 added c + | o 5:e93a9161a274 added c | | () draft - | * 2:b1661037fa25 added b + | o 2:b1661037fa25 added b | | () draft | x 1:c7586e2a9264 added a |/ () draft @@ -283,11 +282,11 @@ | () draft | @ 6:8f20d4390c21 foo to a | | () draft - | | * 5:bcb1c47f8520 added d + | | o 5:bcb1c47f8520 added d | | | () draft | | x 4:86d2603075a3 added c | |/ () draft - | | * 3:17509928e5bf added c + | | o 3:17509928e5bf added c | | | () draft | | x 2:9f0c80a55ddc added b | |/ () draft @@ -297,22 +296,21 @@ () draft $ hg evolve --abort - 2 new orphan changesets evolve aborted working directory is now at 807e8e2ca559 $ hg glog @ 7:807e8e2ca559 added a | () draft - | * 6:8f20d4390c21 foo to a + | o 6:8f20d4390c21 foo to a | | () draft - | | * 5:bcb1c47f8520 added d + | | o 5:bcb1c47f8520 added d | | | () draft - | | * 4:86d2603075a3 added c + | | o 4:86d2603075a3 added c | |/ () draft - | | * 3:17509928e5bf added c + | | o 3:17509928e5bf added c | | | () draft - | | * 2:9f0c80a55ddc added b + | | o 2:9f0c80a55ddc added b | |/ () draft | x 1:2f913b0c9220 added a |/ () draft @@ -346,11 +344,11 @@ | () draft | @ 6:8f20d4390c21 foo to a | | () draft - | | * 5:bcb1c47f8520 added d + | | o 5:bcb1c47f8520 added d | | | () draft | | x 4:86d2603075a3 added c | |/ () draft - | | * 3:17509928e5bf added c + | | o 3:17509928e5bf added c | | | () draft | | x 2:9f0c80a55ddc added b | |/ () draft @@ -375,7 +373,6 @@ adding file changes added 10 changesets with 8 changes to 5 files (+4 heads) 3 new obsolescence markers - 3 new orphan changesets $ cd ../clonerepo $ hg up 7f8e8bd9f0b6 3 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -472,9 +469,9 @@ $ hg glog @ 4:a0086c17bfc7 added a | () draft - | * 3:17509928e5bf added c + | o 3:17509928e5bf added c | | () draft - | * 2:9f0c80a55ddc added b + | o 2:9f0c80a55ddc added b | | (bm1) draft | x 1:2f913b0c9220 added a |/ () draft @@ -506,16 +503,15 @@ () draft $ hg evolve --abort - 1 new orphan changesets evolve aborted working directory is now at a0086c17bfc7 $ hg glog @ 4:a0086c17bfc7 added a | () draft - | * 3:17509928e5bf added c + | o 3:17509928e5bf added c | | () draft - | * 2:9f0c80a55ddc added b + | o 2:9f0c80a55ddc added b | | (bm1) draft | x 1:2f913b0c9220 added a |/ () draft
--- a/tests/test-evolve-abort-phasediv.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-abort-phasediv.t Mon Sep 03 22:59:19 2018 +0200 @@ -186,7 +186,7 @@ | () draft | x 8:9ff8adbe8a24 added c |/ () draft - | * 7:e44ebefe4f54 added d + | o 7:e44ebefe4f54 added d |/ () draft | x 6:ddba58020bc0 added d |/ () draft @@ -218,7 +218,6 @@ [1] $ hg evolve --abort - 1 new phase-divergent changesets evolve aborted working directory is now at 28cd06b3f801 @@ -227,7 +226,7 @@ | () draft | x 8:9ff8adbe8a24 added c |/ () draft - | * 7:e44ebefe4f54 added d + | o 7:e44ebefe4f54 added d |/ () draft | x 6:ddba58020bc0 added d |/ () draft @@ -256,7 +255,7 @@ $ hg glog --hidden @ 10:ef9b72b9b42c added d | () draft - | * 9:28cd06b3f801 added c + | o 9:28cd06b3f801 added c |/ () draft | x 8:9ff8adbe8a24 added c |/ () draft @@ -303,14 +302,13 @@ [1] $ hg evolve --abort - 1 new phase-divergent changesets evolve aborted working directory is now at ef9b72b9b42c $ hg glog --hidden @ 10:ef9b72b9b42c added d | () draft - | * 9:28cd06b3f801 added c + | o 9:28cd06b3f801 added c |/ () draft | x 8:9ff8adbe8a24 added c |/ () draft
--- a/tests/test-evolve-content-divergence.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-content-divergence.t Mon Sep 03 22:59:19 2018 +0200 @@ -34,15 +34,15 @@ have different branches ------------------------------------------------------------------------------- - $ hg branch -r . foobar - changed branch on 1 changesets + $ hg branch foobar + marked working directory as branch foobar + (branches are permanent and global, did you want a bookmark?) + $ hg amend $ hg up c41c793e0ef1 --hidden - updating to a hidden changeset c41c793e0ef1 - (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (c41c793e0ef1) - (use 'hg evolve' to update to its successor: 9e5dffcb3d48) + (use 'hg evolve' to update to its successor: bdeedce1f621) $ echo bar > d $ hg branch watwat marked working directory as branch watwat @@ -52,7 +52,7 @@ $ hg glog @ 6:264b04f771fb added d | () [watwat] draft - | * 5:9e5dffcb3d48 added d + | o 5:bdeedce1f621 added d |/ () [foobar] draft o 3:ca1b80f7960a added c | () [default] draft @@ -69,7 +69,7 @@ merge:[6] added d with: [5] added d base: [4] added d - merging "other" content-divergent changeset '9e5dffcb3d48' + merging "other" content-divergent changeset 'bdeedce1f621' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved content divergent changesets on different branches. choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar? c @@ -109,7 +109,7 @@ $ hg glog @ 9:59081c9c425a added a d with bar in it, expect some beers | () [default] draft - | * 8:f621d00f5f0e added d + | o 8:f621d00f5f0e added d |/ () [foobar] draft o 3:ca1b80f7960a added c | () [default] draft @@ -146,8 +146,6 @@ $ hg amend -m "foo to d" $ hg up a9d6fd6b5e40 --hidden - updating to a hidden changeset a9d6fd6b5e40 - (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (a9d6fd6b5e40) (use 'hg evolve' to update to its successor: b10b07a394f1) @@ -158,7 +156,7 @@ $ hg glog @ 12:0bb497fed24a foo to d | () [default] draft - | * 11:b10b07a394f1 foo to d + | o 11:b10b07a394f1 foo to d |/ () [default] draft o 3:ca1b80f7960a added c | () [default] draft @@ -206,8 +204,6 @@ $ hg amend -m "bar to d, expect beers" $ hg up 11175423b5dc --hidden - updating to a hidden changeset 11175423b5dc - (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (11175423b5dc) (use 'hg evolve' to update to its successor: 27f0463f169a) @@ -218,7 +214,7 @@ $ hg glog @ 15:f542037ddf31 wat to d, wat? | () [default] draft - | * 14:27f0463f169a bar to d, expect beers + | o 14:27f0463f169a bar to d, expect beers |/ () [default] draft o 3:ca1b80f7960a added c | () [default] draft @@ -318,13 +314,13 @@ 2 new content-divergent changesets $ hg glog - * 6:da4b96f4a8d6 added b + o 6:da4b96f4a8d6 added b | () [default] draft | @ 5:7ed0642d644b added b | | () [default] draft - | | * 4:c41c793e0ef1 added d + | | o 4:c41c793e0ef1 added d | | | () [default] draft - | | * 3:ca1b80f7960a added c + | | o 3:ca1b80f7960a added c | | | () [default] draft | | x 2:b1661037fa25 added b | |/ () [default] draft @@ -346,9 +342,9 @@ $ hg glog @ 8:171614c9a791 added b | () [default] draft - | * 4:c41c793e0ef1 added d + | o 4:c41c793e0ef1 added d | | () [default] draft - | * 3:ca1b80f7960a added c + | o 3:ca1b80f7960a added c | | () [default] draft | x 2:b1661037fa25 added b |/ () [default] draft @@ -410,8 +406,6 @@ $ hg amend -m "added foo to x" $ hg up 71a392c714b5 --hidden - updating to a hidden changeset 71a392c714b5 - (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (71a392c714b5) (use 'hg evolve' to update to its successor: 1e1a50385a7d) @@ -422,7 +416,7 @@ $ hg glog @ 13:1e4f6b3bb39b added x | () [default] draft - | * 12:1e1a50385a7d added foo to x + | o 12:1e1a50385a7d added foo to x | | () [bar] draft o | 10:4ae4427ee9f8 added d | | () [default] draft @@ -495,8 +489,6 @@ $ hg amend $ hg up fc6ad2bac162 --hidden - updating to a hidden changeset fc6ad2bac162 - (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (fc6ad2bac162) (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) @@ -509,7 +501,7 @@ $ hg glog @ 19:b4575ed6fcfc added y | () [bar] draft - | * 17:2a9f6ccbdeba added y + | o 17:2a9f6ccbdeba added y | | () [default] draft o | 15:b006cf317e0e added foo to x | | () [bar] draft @@ -630,8 +622,6 @@ $ hg amend $ hg up daf1de08f3b0 --hidden - updating to a hidden changeset daf1de08f3b0 - (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (daf1de08f3b0) (use 'hg evolve' to update to its successor: 3f7a1f693080) @@ -644,7 +634,7 @@ $ hg glog @ 25:53242575ffa9 added z | () [bar] draft - | * 23:3f7a1f693080 added z + | o 23:3f7a1f693080 added z | | () [default] draft o | 21:7bbcf24ddecf added y | | () [bar] draft @@ -869,26 +859,26 @@ adding file changes added 4 changesets with 0 changes to 4 files (+1 heads) 5 new obsolescence markers - 8 new content-divergent changesets new changesets 82b74d5dc678:15c781f93cac (run 'hg heads' to see heads, 'hg merge' to merge) + 8 new content-divergent changesets $ hg glog - * 12:15c781f93cac added d + o 12:15c781f93cac added d | () [default] draft - * 11:9e5fb1d5b955 added c + o 11:9e5fb1d5b955 added c | () [default] draft - * 10:88516dccf68a added b + o 10:88516dccf68a added b | () [default] draft - * 9:82b74d5dc678 watbar to a + o 9:82b74d5dc678 watbar to a | () [default] draft | @ 8:c72d2885eb51 added d | | () [default] draft - | * 7:3ce4be6d8e5e added c + | o 7:3ce4be6d8e5e added c | | () [default] draft - | * 6:d5f148423c16 added b + | o 6:d5f148423c16 added b | | () [default] draft - | * 5:8e222f257bbf watbar to a + | o 5:8e222f257bbf watbar to a |/ () [default] draft o 0:8fa14d15e168 added hgignore () [default] draft @@ -900,7 +890,6 @@ updating to "local" side of the conflict: 8e222f257bbf merging "other" content-divergent changeset '82b74d5dc678' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - 6 new orphan changesets merge:[6] added b with: [10] added b base: [2] added b
--- a/tests/test-evolve-continue.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-continue.t Mon Sep 03 22:59:19 2018 +0200 @@ -42,7 +42,7 @@ $ hg glog @ 5:cb6a2ab625bb added c | () draft - | * 4:c41c793e0ef1 added d + | o 4:c41c793e0ef1 added d | | () draft | x 3:ca1b80f7960a added c |/ () draft @@ -97,7 +97,7 @@ $ hg glog @ 8:00a5c774cc37 added d | () draft - | * 7:ad0a59d83efe added e + | o 7:ad0a59d83efe added e | | () draft | x 6:2a4e03d422e2 added d |/ () draft @@ -216,13 +216,13 @@ $ hg glog @ 16:645135c5caa4 added c | () draft - | * 15:09becba8f97d added h + | o 15:09becba8f97d added h | | () draft - | * 14:5aa7b2bbd944 added g + | o 14:5aa7b2bbd944 added g | | () draft - | * 13:be88f889b6dc added f + | o 13:be88f889b6dc added f | | () draft - | * 12:6642d2c9176e added d + | o 12:6642d2c9176e added d | | () draft | x 11:95665a2de664 added c |/ () draft
--- a/tests/test-evolve-issue5832.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-issue5832.t Mon Sep 03 22:59:19 2018 +0200 @@ -69,11 +69,11 @@ |/ () draft | o 5:7014ec2829cd added a |/ () draft - | * 4:b9b387427a53 merge commit + | o 4:b9b387427a53 merge commit | |\ () draft +---o 3:9402371b436e added c and d | | () draft - | * 2:a1da0651488c added b + | o 2:a1da0651488c added b | | () draft | x 1:1b24879c5c3c added a |/ () draft @@ -90,11 +90,11 @@ |/ () draft | o 5:7014ec2829cd added a |/ () draft - | * 4:b9b387427a53 merge commit + | o 4:b9b387427a53 merge commit | |\ () draft +---x 3:9402371b436e added c and d | | () draft - | * 2:a1da0651488c added b + | o 2:a1da0651488c added b | | () draft | x 1:1b24879c5c3c added a |/ () draft @@ -193,7 +193,6 @@ $ hg ci -Aqm "added l" $ hg pick -r 1b24879c5c3c picking 1:1b24879c5c3c "added a" - 2 new orphan changesets $ hg up bde1d2b6b5e5 0 files updated, 0 files merged, 2 files removed, 0 files unresolved @@ -213,11 +212,11 @@ | | () draft | o 5:0a6281e212fe added l |/ () draft - | * 4:b9b387427a53 merge commit + | o 4:b9b387427a53 merge commit | |\ () draft +---o 3:9402371b436e added c and d | | () draft - | * 2:a1da0651488c added b + | o 2:a1da0651488c added b | | () draft | x 1:1b24879c5c3c added a |/ () draft @@ -236,11 +235,11 @@ | | () draft | o 5:0a6281e212fe added l |/ () draft - | * 4:b9b387427a53 merge commit + | o 4:b9b387427a53 merge commit | |\ () draft +---x 3:9402371b436e added c and d | | () draft - | * 2:a1da0651488c added b + | o 2:a1da0651488c added b | | () draft | x 1:1b24879c5c3c added a |/ () draft @@ -339,7 +338,6 @@ $ hg ci -Aqm "added l" $ hg pick -r 1b24879c5c3c picking 1:1b24879c5c3c "added a" - 2 new orphan changesets $ hg up bde1d2b6b5e5 0 files updated, 0 files merged, 2 files removed, 0 files unresolved @@ -359,11 +357,11 @@ | | () draft | o 5:0a6281e212fe added l |/ () draft - | * 4:b9b387427a53 merge commit + | o 4:b9b387427a53 merge commit | |\ () draft +---o 3:9402371b436e added c and d | | () draft - | * 2:a1da0651488c added b + | o 2:a1da0651488c added b | | () draft | x 1:1b24879c5c3c added a |/ () draft @@ -382,11 +380,11 @@ | | () draft | o 5:0a6281e212fe added l |/ () draft - | * 4:b9b387427a53 merge commit + | o 4:b9b387427a53 merge commit | |\ () draft +---x 3:9402371b436e added c and d | | () draft - | * 2:a1da0651488c added b + | o 2:a1da0651488c added b | | () draft | x 1:1b24879c5c3c added a |/ () draft
--- a/tests/test-evolve-noupdate.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-noupdate.t Mon Sep 03 22:59:19 2018 +0200 @@ -48,9 +48,9 @@ $ hg glog @ 5:7ed0642d644b added b | () draft - | * 4:c41c793e0ef1 added d + | o 4:c41c793e0ef1 added d | | () draft - | * 3:ca1b80f7960a added c + | o 3:ca1b80f7960a added c | | () draft | x 2:b1661037fa25 added b |/ () draft @@ -93,9 +93,9 @@ $ hg glog o 8:3d41537b44ca added a | () draft - | * 7:b6b20b8eefdc added d + | o 7:b6b20b8eefdc added d | | () draft - | * 6:7c46f743e62f added c + | o 6:7c46f743e62f added c | | () draft | @ 5:7ed0642d644b added b | | () draft
--- a/tests/test-evolve-obshistory-amend-then-fold.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-obshistory-amend-then-fold.t Mon Sep 03 22:59:19 2018 +0200 @@ -231,14 +231,10 @@ (use --hidden to access hidden revisions; successor: eb5a0daa2192) [255] $ hg update --hidden 'desc(A0)' - updating to a hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: eb5a0daa2192) $ hg update --hidden 0dec01379d3b - updating to a hidden changeset 0dec01379d3b - (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its successor: eb5a0daa2192)
--- a/tests/test-evolve-obshistory-amend.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-obshistory-amend.t Mon Sep 03 22:59:19 2018 +0200 @@ -199,8 +199,6 @@ (use --hidden to access hidden revisions; successor: 4ae3a4151de9) [255] $ hg update --hidden "desc(A0)" - updating to a hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: 4ae3a4151de9)
--- a/tests/test-evolve-obshistory-complex.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-obshistory-complex.t Mon Sep 03 22:59:19 2018 +0200 @@ -67,8 +67,8 @@ ------------------------ $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0" + 2 changesets folded 4 new orphan changesets - 2 changesets folded $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1" 2 changesets folded $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" -n "folding changesets to test" @@ -94,7 +94,7 @@ | instability: orphan | summary: fold2 | - | * changeset: 8:d15d0ffc75f6 + | o changeset: 8:d15d0ffc75f6 | | parent: 2:c473644ee0e9 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 @@ -208,7 +208,6 @@ record this change to 'D'? [Ynesfdaq?] Y no more change to split - 1 new orphan changesets $ hg split "desc(fold2)" -d "0 0" << EOF > Y > Y @@ -243,7 +242,6 @@ record this change to 'F'? [Ynesfdaq?] Y no more change to split - 1 new orphan changesets $ hg log -G @ changeset: 15:d4a000f63ee9 | tag: tip @@ -252,20 +250,20 @@ | instability: orphan | summary: fold2 | - * changeset: 14:ec31316faa9d + o changeset: 14:ec31316faa9d | parent: 4:868d2e0eb19c | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | instability: orphan | summary: fold2 | - | * changeset: 13:d0f33db50670 + | o changeset: 13:d0f33db50670 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | instability: orphan | | summary: fold1 | | - | * changeset: 12:7b3290f6e0a0 + | o changeset: 12:7b3290f6e0a0 | | parent: 2:c473644ee0e9 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 @@ -328,14 +326,14 @@ | instability: orphan | summary: fold2 | - * changeset: 14:ec31316faa9d + o changeset: 14:ec31316faa9d | parent: 4:868d2e0eb19c | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | instability: orphan | summary: fold2 | - | * changeset: 12:7b3290f6e0a0 + | o changeset: 12:7b3290f6e0a0 | | parent: 2:c473644ee0e9 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 @@ -384,7 +382,7 @@ walking algorithm works no matter the level of successors + precursors $ hg obslog 12 - * 7b3290f6e0a0 (12) fold1 + o 7b3290f6e0a0 (12) fold1 |\ x | d15d0ffc75f6 (8) fold1 |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000) @@ -412,11 +410,11 @@ $ hg obslog --all 15 o 19e14c8397fc (10) fold0 | - | * 7b3290f6e0a0 (12) fold1 + | o 7b3290f6e0a0 (12) fold1 | |\ | | | @ d4a000f63ee9 (15) fold2 | | | | - | | | | * ec31316faa9d (14) fold2 + | | | | o ec31316faa9d (14) fold2 | | | |/| | | | x | 100cc25b765f (9) fold2 | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d using split by test (Thu Jan 01 00:00:00 1970 +0000)
--- a/tests/test-evolve-obshistory-content-divergent.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-obshistory-content-divergent.t Mon Sep 03 22:59:19 2018 +0200 @@ -37,8 +37,6 @@ summary: ROOT $ hg update --hidden 'desc(A0)' - updating to a hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: fdf9bde5129a) @@ -53,7 +51,7 @@ | instability: content-divergent | summary: A2 | - | * changeset: 2:fdf9bde5129a + | o changeset: 2:fdf9bde5129a |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 @@ -100,7 +98,7 @@ $ hg obslog --hidden --all 471f378eab4c --patch @ 65b757b745b9 (3) A2 | - | * fdf9bde5129a (2) A1 + | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) @@ -163,7 +161,7 @@ Check that debugobshistory on the first diverged revision show the revision and the diverent one $ hg obslog fdf9bde5129a --patch - * fdf9bde5129a (2) A1 + o fdf9bde5129a (2) A1 | x 471f378eab4c (1) A0 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) @@ -188,7 +186,7 @@ $ hg obslog fdf9bde5129a -a --patch @ 65b757b745b9 (3) A2 | - | * fdf9bde5129a (2) A1 + | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) @@ -235,7 +233,7 @@ $ hg obslog 65b757b745b9 -a --patch @ 65b757b745b9 (3) A2 | - | * fdf9bde5129a (2) A1 + | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) @@ -260,7 +258,7 @@ $ hg obslog '65b757b745b9+fdf9bde5129a' --patch @ 65b757b745b9 (3) A2 | - | * fdf9bde5129a (2) A1 + | o fdf9bde5129a (2) A1 |/ x 471f378eab4c (1) A0 rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) @@ -337,8 +335,6 @@ (use --hidden to access hidden revisions; diverged) [255] $ hg update --hidden 'desc(A0)' - updating to a hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' has diverged) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
--- a/tests/test-evolve-obshistory-fold.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-obshistory-fold.t Mon Sep 03 22:59:19 2018 +0200 @@ -229,8 +229,6 @@ (use --hidden to access hidden revisions; successor: eb5a0daa2192) [255] $ hg update --hidden 'desc(A0)' - updating to a hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: eb5a0daa2192) @@ -239,8 +237,6 @@ (use --hidden to access hidden revisions; successor: eb5a0daa2192) [255] $ hg update --hidden 'desc(B0)' - updating to a hidden changeset 0dec01379d3b - (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its successor: eb5a0daa2192)
--- a/tests/test-evolve-obshistory-lots-of-splits.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-obshistory-lots-of-splits.t Mon Sep 03 22:59:19 2018 +0200 @@ -281,8 +281,6 @@ (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) [255] $ hg update --hidden 'min(desc(A0))' - updating to a hidden changeset de7290d8b885 - (hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (de7290d8b885) (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more)
--- a/tests/test-evolve-obshistory-phase-divergent.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-obshistory-phase-divergent.t Mon Sep 03 22:59:19 2018 +0200 @@ -37,15 +37,13 @@ summary: ROOT $ hg update --hidden 'desc(A0)' - updating to a hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: fdf9bde5129a) $ hg phase -p . 1 new phase-divergent changesets $ hg log --hidden -G - * changeset: 2:fdf9bde5129a + o changeset: 2:fdf9bde5129a | tag: tip | parent: 0:ea207398892e | user: test @@ -81,7 +79,7 @@ Check that with all option, every changeset is shown $ hg obslog --hidden --all 471f378eab4c --patch - * fdf9bde5129a (2) A1 + o fdf9bde5129a (2) A1 | @ 471f378eab4c (1) A0 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) @@ -121,7 +119,7 @@ Check that debugobshistory on the first diverged revision show the revision and the diverent one $ hg obslog fdf9bde5129a --patch - * fdf9bde5129a (2) A1 + o fdf9bde5129a (2) A1 | @ 471f378eab4c (1) A0 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) @@ -136,7 +134,7 @@ Check that all option show all of them $ hg obslog fdf9bde5129a -a --patch - * fdf9bde5129a (2) A1 + o fdf9bde5129a (2) A1 | @ 471f378eab4c (1) A0 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) @@ -151,7 +149,7 @@ Check that debugobshistory on the second diverged revision show the revision and the diverent one $ hg obslog fdf9bde5129a --patch - * fdf9bde5129a (2) A1 + o fdf9bde5129a (2) A1 | @ 471f378eab4c (1) A0 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) @@ -165,7 +163,7 @@ Check that all option show all of them $ hg obslog fdf9bde5129a -a --patch - * fdf9bde5129a (2) A1 + o fdf9bde5129a (2) A1 | @ 471f378eab4c (1) A0 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) @@ -180,7 +178,7 @@ Check that debugobshistory on the both diverged revision show a coherent graph $ hg obslog 'fdf9bde5129a+fdf9bde5129a' --patch - * fdf9bde5129a (2) A1 + o fdf9bde5129a (2) A1 | @ 471f378eab4c (1) A0 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
--- a/tests/test-evolve-obshistory-prune.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-obshistory-prune.t Mon Sep 03 22:59:19 2018 +0200 @@ -106,8 +106,6 @@ (use --hidden to access hidden revisions; pruned) [255] $ hg up --hidden -r 'desc(B0)' - updating to a hidden changeset 0dec01379d3b - (hidden revision '0dec01379d3b' is pruned) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its parent successor)
--- a/tests/test-evolve-obshistory-split.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-obshistory-split.t Mon Sep 03 22:59:19 2018 +0200 @@ -203,8 +203,6 @@ (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) [255] $ hg update --hidden 'min(desc(A0))' - updating to a hidden changeset 471597cad322 - (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471597cad322) (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
--- a/tests/test-evolve-order.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-order.t Mon Sep 03 22:59:19 2018 +0200 @@ -48,9 +48,9 @@ $ hg log -G @ 4:12d519679175@default(draft) add _a | - | * 3:4d156641b718@default(draft) add _c + | o 3:4d156641b718@default(draft) add _c | | - | * 2:4d7242ebb004@default(draft) add _b + | o 2:4d7242ebb004@default(draft) add _b | | | x 1:2d73fcd7f07d@default(draft) add _a |/ @@ -88,13 +88,13 @@ $ hg log -G @ 11:9a584314f3f3@default(draft) asecond | - | * 10:a59c79776f7c@default(draft) bprime + | o 10:a59c79776f7c@default(draft) bprime | | | x 8:81a687b96d4d@default(draft) aprime |/ - | * 7:464731bc0ed0@default(draft) add _d + | o 7:464731bc0ed0@default(draft) add _d | | - | * 6:52b8f9b04f83@default(draft) add _c + | o 6:52b8f9b04f83@default(draft) add _c | | | x 5:59476c3836ef@default(draft) add _b | | @@ -140,13 +140,13 @@ $ hg log -G -r "desc(_d)::" @ 21:dcf786e878fd@default(draft) add c1second | - | * 20:507d52d715f6@default(draft) add c2prime + | o 20:507d52d715f6@default(draft) add c2prime | | | x 19:c995cb124ddc@default(draft) add c1prime |/ - | * 18:d096a2437fd0@default(draft) add c4_ + | o 18:d096a2437fd0@default(draft) add c4_ | | - | * 17:cde95c6cba7a@default(draft) add c3_ + | o 17:cde95c6cba7a@default(draft) add c3_ | | | x 16:e0d9f7a099fe@default(draft) add c2_ | | @@ -172,7 +172,7 @@ | o 26:4acf61f11dfb@default(draft) add b1prime | - | * 25:594e1fbbd61f@default(draft) add b4_ + | o 25:594e1fbbd61f@default(draft) add b4_ | | | x 24:be27500cfc76@default(draft) add b3_ | | @@ -182,13 +182,13 @@ |/ | o 21:dcf786e878fd@default(draft) add c1second |/ - | * 20:507d52d715f6@default(draft) add c2prime + | o 20:507d52d715f6@default(draft) add c2prime | | | x 19:c995cb124ddc@default(draft) add c1prime |/ - | * 18:d096a2437fd0@default(draft) add c4_ + | o 18:d096a2437fd0@default(draft) add c4_ | | - | * 17:cde95c6cba7a@default(draft) add c3_ + | o 17:cde95c6cba7a@default(draft) add c3_ | | | x 16:e0d9f7a099fe@default(draft) add c2_ | |
--- a/tests/test-evolve-orphan-merge.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-orphan-merge.t Mon Sep 03 22:59:19 2018 +0200 @@ -56,7 +56,7 @@ $ hg glog @ 4:64370c9805e7 added b | () draft - | * 3:3b2b6f4652ee merging a and b + | o 3:3b2b6f4652ee merging a and b | |\ () draft +---x 2:d76850646258 added b | | () draft @@ -101,7 +101,7 @@ $ hg glog @ 6:3d41537b44ca added a | () draft - | * 5:91fd62122a4b merging a and b + | o 5:91fd62122a4b merging a and b | |\ () draft +---o 4:64370c9805e7 added b | | () draft @@ -177,7 +177,7 @@ merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1] $ echo foobar > c $ hg resolve -m @@ -205,7 +205,7 @@ $ hg glog @ 11:31c317b7bdb1 foo to c | () draft - | * 10:fd41d25a3e90 foobar to c + | o 10:fd41d25a3e90 foobar to c | |\ () draft +---o 9:d0f84b25d4e3 bar to c | | () draft @@ -260,7 +260,7 @@ $ hg glog @ 13:928097d0b5b5 foo to c | () draft - | * 12:c5405d2da7a1 foobar to c + | o 12:c5405d2da7a1 foobar to c | |\ () draft +---x 11:31c317b7bdb1 foo to c | | () draft @@ -334,13 +334,13 @@ $ hg glog @ 20:fccc9de66799 added l | () draft - | * 19:190763373d8b merge commit + | o 19:190763373d8b merge commit | |\ () draft | | o 18:863d11043c67 added y | | | () draft +---o 17:3f2247835c1d added x | | () draft - | * 16:e44dc179e7f5 added m + | o 16:e44dc179e7f5 added m | | () draft | x 15:8634bee7bf1e added l |/ () draft @@ -402,7 +402,7 @@ | () draft | o 24:3f371171d767 added l |/ () draft - | * 23:7b78a9784f3e merged l and x + | o 23:7b78a9784f3e merged l and x | |\ () draft +---x 20:fccc9de66799 added l | | () draft
--- a/tests/test-evolve-orphan-split.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-orphan-split.t Mon Sep 03 22:59:19 2018 +0200 @@ -60,14 +60,13 @@ created new head Done splitting? [yN] y - 1 new orphan changesets $ hg glog @ 4:8b179cffc81c added a and b | () draft o 3:bd3735d4dab0 added a and b | () draft - | * 2:86e1ebf1ca61 added c + | o 2:86e1ebf1ca61 added c | | () draft | x 1:d0ddb614efbd added a and b |/ () draft @@ -153,14 +152,13 @@ created new head Done splitting? [yN] y - 1 new orphan changesets $ hg glog @ 9:c0fbf8aaf6c4 added a b c | () draft o 8:f2632392aefe added a b c | () draft - | * 7:d48a30875f01 added d + | o 7:d48a30875f01 added d | | () draft | x 6:f89e4764f2ed added a b c |/ () draft @@ -174,7 +172,7 @@ | () draft | o 8:f2632392aefe added a b c |/ () draft - | * 7:d48a30875f01 added d + | o 7:d48a30875f01 added d | | () draft | x 6:f89e4764f2ed added a b c |/ () draft
--- a/tests/test-evolve-phase-divergence.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-phase-divergence.t Mon Sep 03 22:59:19 2018 +0200 @@ -571,17 +571,8 @@ rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) $ hg glog -r .^:: - @ 10:334e300d6db5 added x to x - | (bm) draft - | o 9:2352021b3785 added x to x - | | () public - | o 8:502e73736632 phase-divergent update to b756eb10ea73: - | | () public - | o 6:b756eb10ea73 added bar to bar - |/ () public - o 5:3d62500c673d phase-divergent update to aa071e5554e3: - | () public - ~ + hg: parse error at 4: not a prefix: end + [255] Using `hg evolve` to resolve phase-divergence --------------------------------------------- @@ -970,7 +961,7 @@ $ hg glog -r 428f7900a969:: @ 28:63ccb8ea7cae added n | () draft - * 27:f313e2b90e70 added m + o 27:f313e2b90e70 added m | () draft | o 26:849cee0a874b added m and n |/ () public @@ -983,7 +974,6 @@ atop:[26] added m and n computing new diff committed as 870e1c3eddc3 - 1 new orphan changesets recreate:[28] added n atop:[26] added m and n rebasing to destination parent: 428f7900a969 @@ -1083,7 +1073,7 @@ $ hg glog -r 154b0179fb9b:: @ 34:e046341aa97c added q | () draft - | * 33:6f8c250eecff added p + | o 33:6f8c250eecff added p |/ () draft | o 32:8a70f55b2af3 added p and q |/ () public
--- a/tests/test-evolve-phase.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-phase.t Mon Sep 03 22:59:19 2018 +0200 @@ -75,7 +75,7 @@ $ hg glog @ 3 - 87495ea7c9ec b (draft) | - | * 2 - 13833940840c c (secret) + | o 2 - 13833940840c c (secret) | | | x 1 - 1e6c11564562 b (draft) |/
--- a/tests/test-evolve-split.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-split.t Mon Sep 03 22:59:19 2018 +0200 @@ -50,7 +50,7 @@ | o 3:a7fdfda64c08@default(draft) _oo | - | * 2:f52200b086ca@default(draft) add uu + | o 2:f52200b086ca@default(draft) add uu | | | x 1:d55647aaa0c6@default(draft) oo+pp |/
--- a/tests/test-evolve-stop-contentdiv.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-stop-contentdiv.t Mon Sep 03 22:59:19 2018 +0200 @@ -42,8 +42,6 @@ $ hg amend $ hg up c41c793e0ef1 --hidden - updating to a hidden changeset c41c793e0ef1 - (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (c41c793e0ef1) (use 'hg evolve' to update to its successor: e49523854bc8) @@ -54,7 +52,7 @@ $ hg glog --hidden @ 6:9c1631e352d9 added d | () draft - | * 5:e49523854bc8 added d + | o 5:e49523854bc8 added d |/ () draft | x 4:c41c793e0ef1 added d |/ () draft @@ -85,7 +83,7 @@ $ hg glog --hidden @ 6:9c1631e352d9 added d | () draft - | * 5:e49523854bc8 added d + | o 5:e49523854bc8 added d |/ () draft | x 4:c41c793e0ef1 added d |/ () draft @@ -108,7 +106,7 @@ $ hg glog @ 7:517d4375cb72 added d | () draft - | * 5:e49523854bc8 added d + | o 5:e49523854bc8 added d | | () draft | o 3:ca1b80f7960a added c | | () draft @@ -139,7 +137,7 @@ $ hg glog @ 7:517d4375cb72 added d | () draft - | * 5:e49523854bc8 added d + | o 5:e49523854bc8 added d | | () draft | o 3:ca1b80f7960a added c | | () draft @@ -160,7 +158,7 @@ $ hg glog @ 8:8fd1c4bd144c added d | () draft - | * 5:e49523854bc8 added d + | o 5:e49523854bc8 added d | | () draft | o 3:ca1b80f7960a added c | | () draft @@ -203,9 +201,9 @@ XXX: we should have preserved the wdir to be at rev 8 $ hg glog - * 8:8fd1c4bd144c added d + o 8:8fd1c4bd144c added d | () draft - | * 5:e49523854bc8 added d + | o 5:e49523854bc8 added d | | () draft | @ 3:ca1b80f7960a added c | | () draft
--- a/tests/test-evolve-stop-orphan.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-stop-orphan.t Mon Sep 03 22:59:19 2018 +0200 @@ -74,7 +74,7 @@ $ hg glog @ 5:cb6a2ab625bb added c | () draft - | * 4:c41c793e0ef1 added d + | o 4:c41c793e0ef1 added d | | () draft | x 3:ca1b80f7960a added c |/ () draft @@ -117,7 +117,7 @@ $ hg glog @ 5:cb6a2ab625bb added c | () draft - | * 4:c41c793e0ef1 added d + | o 4:c41c793e0ef1 added d | | () draft | x 3:ca1b80f7960a added c |/ () draft @@ -157,7 +157,7 @@ $ hg glog @ 5:cb6a2ab625bb added c | () draft - | * 4:c41c793e0ef1 added d + | o 4:c41c793e0ef1 added d | | () draft | x 3:ca1b80f7960a added c |/ () draft @@ -227,13 +227,13 @@ $ hg glog @ 7:21817cd42526 added hgignore () draft - * 6:2a4e03d422e2 added d + o 6:2a4e03d422e2 added d | () draft - * 5:cb6a2ab625bb added c + o 5:cb6a2ab625bb added c | () draft - * 2:b1661037fa25 added b + o 2:b1661037fa25 added b | () draft - * 1:c7586e2a9264 added a + o 1:c7586e2a9264 added a | () draft x 0:8fa14d15e168 added hgignore () draft @@ -266,9 +266,9 @@ | () draft o 7:21817cd42526 added hgignore () draft - * 6:2a4e03d422e2 added d + o 6:2a4e03d422e2 added d | () draft - * 5:cb6a2ab625bb added c + o 5:cb6a2ab625bb added c | () draft x 2:b1661037fa25 added b | () draft @@ -342,11 +342,11 @@ $ hg glog @ 12:a3cc2042492f added a | () draft - | * 11:cd0909a30222 added d + | o 11:cd0909a30222 added d | | () draft - | * 10:cb1dd1086ef6 added c + | o 10:cb1dd1086ef6 added c | | (b1) draft - | * 9:aec285328e90 added b + | o 9:aec285328e90 added b | | (b2) draft | x 8:fd00db71edca added a |/ () draft @@ -373,9 +373,9 @@ | (b2) draft o 12:a3cc2042492f added a | () draft - | * 11:cd0909a30222 added d + | o 11:cd0909a30222 added d | | () draft - | * 10:cb1dd1086ef6 added c + | o 10:cb1dd1086ef6 added c | | (b1) draft | x 9:aec285328e90 added b | | () draft
--- a/tests/test-evolve-stop-phasediv.t Mon Sep 03 22:59:18 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,107 +0,0 @@ -Tests for the --stop flag for `hg evolve` command while resolving phase-divergence -================================================================================== - -The `--stop` flag stops the interrupted evolution and delete the state file so -user can do other things and comeback and do evolution later on - -This is testing cases when `hg evolve` command is doing phase-divergence resolution. - -Setup -===== - - $ cat >> $HGRCPATH <<EOF - > [alias] - > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}" - > [extensions] - > EOF - $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH - - $ hg init stoprepo - $ cd stoprepo - $ echo ".*\.orig" > .hgignore - $ hg add .hgignore - $ hg ci -m "added hgignore" - $ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done; - - $ hg glog - @ 4:c41c793e0ef1 added d - | () draft - o 3:ca1b80f7960a added c - | () draft - o 2:b1661037fa25 added b - | () draft - o 1:c7586e2a9264 added a - | () draft - o 0:8fa14d15e168 added hgignore - () draft - -Creating phase divergence, resolution of which will lead to conflicts ----------------------------------------------------------------------- - - $ hg up .^^^ - 0 files updated, 0 files merged, 3 files removed, 0 files unresolved - $ hg pick -r .~-3 - picking 4:c41c793e0ef1 "added d" - $ echo foobar > c - $ hg add c - $ hg amend - - $ hg glog --hidden - @ 6:ddba58020bc0 added d - | () draft - | x 5:cfe30edc6125 added d - |/ () draft - | x 4:c41c793e0ef1 added d - | | () draft - | o 3:ca1b80f7960a added c - | | () draft - | o 2:b1661037fa25 added b - |/ () draft - o 1:c7586e2a9264 added a - | () draft - o 0:8fa14d15e168 added hgignore - () draft - - $ hg phase -r c41c793e0ef1 --public --hidden - 1 new phase-divergent changesets - - $ hg glog - @ 6:ddba58020bc0 added d - | () draft - | o 4:c41c793e0ef1 added d - | | () public - | o 3:ca1b80f7960a added c - | | () public - | o 2:b1661037fa25 added b - |/ () public - o 1:c7586e2a9264 added a - | () public - o 0:8fa14d15e168 added hgignore - () public - $ hg evolve --phase-divergent - recreate:[6] added d - atop:[4] added d - rebasing to destination parent: ca1b80f7960a - merging c - warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` - [1] - - $ hg evolve --stop - stopped the interrupted evolve - working directory is now at ca1b80f7960a - -XXX: maybe we should update wdir to where it was - $ hg glog - * 6:ddba58020bc0 added d - | () draft - | o 4:c41c793e0ef1 added d - | | () public - | @ 3:ca1b80f7960a added c - | | () public - | o 2:b1661037fa25 added b - |/ () public - o 1:c7586e2a9264 added a - | () public - o 0:8fa14d15e168 added hgignore - () public
--- a/tests/test-evolve-templates.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-templates.t Mon Sep 03 22:59:19 2018 +0200 @@ -63,8 +63,6 @@ Check templates --------------- $ hg up 'desc(A0)' --hidden - updating to a hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: d004c8f274b9) @@ -156,8 +154,6 @@ $ hg up 'desc(A1)' --hidden - updating to a hidden changeset a468dc9b3633 - (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (a468dc9b3633) (use 'hg evolve' to update to its successor: d004c8f274b9) @@ -332,8 +328,6 @@ --------------- $ hg up 'obsolete()' --hidden - updating to a hidden changeset 471597cad322 - (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471597cad322) (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) @@ -463,8 +457,6 @@ --------------- $ hg up 'desc(A0)' --hidden - updating to a hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: eb5a0daa2192) @@ -490,8 +482,6 @@ o ea207398892e $ hg up 'desc(B0)' --hidden - updating to a hidden changeset 0dec01379d3b - (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its successor: eb5a0daa2192) @@ -597,8 +587,6 @@ summary: ROOT $ hg update --hidden 'desc(A0)' - updating to a hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: fdf9bde5129a) @@ -613,7 +601,7 @@ | instability: content-divergent | summary: A2 | - | * changeset: 2:fdf9bde5129a + | o changeset: 2:fdf9bde5129a |/ parent: 0:ea207398892e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 @@ -638,18 +626,16 @@ --------------- $ hg up 'desc(A0)' --hidden - updating to a hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' has diverged) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) Precursors template should show current revision as it is the working copy $ hg tlog - * 019fadeab383 + o 019fadeab383 | Precursors: 1:471f378eab4c | semi-colon: 1:471f378eab4c - | * fdf9bde5129a + | o fdf9bde5129a |/ Precursors: 1:471f378eab4c | semi-colon: 1:471f378eab4c | @ 471f378eab4c @@ -661,9 +647,9 @@ o ea207398892e $ hg fatelog - * 019fadeab383 + o 019fadeab383 | - | * fdf9bde5129a + | o fdf9bde5129a |/ | @ 471f378eab4c |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383 @@ -676,7 +662,7 @@ Precursors template should not show precursors as it's not displayed in the log $ hg tlog - * 019fadeab383 + o 019fadeab383 | | @ fdf9bde5129a |/ @@ -684,7 +670,7 @@ $ hg fatelog - * 019fadeab383 + o 019fadeab383 | | @ fdf9bde5129a |/ @@ -692,7 +678,7 @@ Precursors template should a precursor as we force its display with --hidden $ hg tlog --hidden - * 019fadeab383 + o 019fadeab383 | Precursors: 3:65b757b745b9 | semi-colon: 3:65b757b745b9 | x 65b757b745b9 @@ -714,7 +700,7 @@ o ea207398892e $ hg fatelog --hidden - * 019fadeab383 + o 019fadeab383 | | x 65b757b745b9 |/ Obsfate: reworded using amend as 4:019fadeab383 @@ -802,8 +788,6 @@ --------------- $ hg up 'desc(A0)' --hidden - updating to a hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: eb5a0daa2192) @@ -827,8 +811,6 @@ o ea207398892e $ hg up 'desc(B0)' --hidden - updating to a hidden changeset 0dec01379d3b - (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its successor: eb5a0daa2192) @@ -861,8 +843,6 @@ $ hg up 'desc(B1)' --hidden - updating to a hidden changeset b7ea6d14e664 - (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (b7ea6d14e664) (use 'hg evolve' to update to its successor: eb5a0daa2192) @@ -1101,7 +1081,6 @@ $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` obsoleted 1 changesets - 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` obsoleted 1 changesets $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` @@ -1120,8 +1099,6 @@ o ea207398892e $ hg up -r "desc(B0)" --hidden - updating to a hidden changeset 0dec01379d3b - (hidden revision '0dec01379d3b' is pruned) 2 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (0dec01379d3b) (use 'hg evolve' to update to its parent successor) @@ -1336,14 +1313,14 @@ | instability: content-divergent | summary: Add B only | - | * changeset: 8:b18bc8331526 + | o changeset: 8:b18bc8331526 |/ parent: 5:dd800401bd8c | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | instability: content-divergent | summary: Add only B | - | * changeset: 7:ba2ed02b0c9a + | o changeset: 7:ba2ed02b0c9a | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | instability: orphan, content-divergent @@ -1356,7 +1333,7 @@ | obsolete: reworded using amend as 9:0b997eb7ceee | summary: Add A,B,C | - * changeset: 5:dd800401bd8c + o changeset: 5:dd800401bd8c | parent: 3:f897c6137566 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 @@ -1381,10 +1358,10 @@ @ 0b997eb7ceee | Precursors: 6:4a004186e638 | semi-colon: 6:4a004186e638 - | * b18bc8331526 + | o b18bc8331526 |/ Precursors: 6:4a004186e638 | semi-colon: 6:4a004186e638 - | * ba2ed02b0c9a + | o ba2ed02b0c9a | | | x 4a004186e638 |/ Successors: 8:b18bc8331526; 9:0b997eb7ceee @@ -1392,7 +1369,7 @@ | Fate: reworded using amend as 8:b18bc8331526 | Fate: reworded using amend as 9:0b997eb7ceee | - * dd800401bd8c + o dd800401bd8c | o f897c6137566 | @@ -1401,14 +1378,14 @@ $ hg fatelog @ 0b997eb7ceee | - | * b18bc8331526 + | o b18bc8331526 |/ - | * ba2ed02b0c9a + | o ba2ed02b0c9a | | | x 4a004186e638 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee | - * dd800401bd8c + o dd800401bd8c | o f897c6137566 | @@ -1418,10 +1395,10 @@ @ 0b997eb7ceee | Precursors: 6:4a004186e638 | semi-colon: 6:4a004186e638 - | * b18bc8331526 + | o b18bc8331526 |/ Precursors: 6:4a004186e638 | semi-colon: 6:4a004186e638 - | * ba2ed02b0c9a + | o ba2ed02b0c9a | | Precursors: 4:9bd10a0775e4 | | semi-colon: 4:9bd10a0775e4 | x 4a004186e638 @@ -1432,7 +1409,7 @@ | Fate: reworded using amend as 8:b18bc8331526 | Fate: reworded using amend as 9:0b997eb7ceee | - * dd800401bd8c + o dd800401bd8c | Precursors: 4:9bd10a0775e4 | semi-colon: 4:9bd10a0775e4 | x 9bd10a0775e4 @@ -1463,14 +1440,14 @@ $ hg fatelog --hidden @ 0b997eb7ceee | - | * b18bc8331526 + | o b18bc8331526 |/ - | * ba2ed02b0c9a + | o ba2ed02b0c9a | | | x 4a004186e638 |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee | - * dd800401bd8c + o dd800401bd8c | | x 9bd10a0775e4 |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a @@ -1486,24 +1463,22 @@ o ea207398892e $ hg up --hidden 4 - updating to a hidden changeset 9bd10a0775e4 - (hidden revision '9bd10a0775e4' has diverged) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (9bd10a0775e4) (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) $ hg rebase -r 7 -d 8 --config extensions.rebase= rebasing 7:ba2ed02b0c9a "Add A,B,C" $ hg tlog - * eceed8f98ffc + o eceed8f98ffc | Precursors: 4:9bd10a0775e4 | semi-colon: 4:9bd10a0775e4 - | * 0b997eb7ceee + | o 0b997eb7ceee | | Precursors: 4:9bd10a0775e4 | | semi-colon: 4:9bd10a0775e4 - * | b18bc8331526 + o | b18bc8331526 |/ Precursors: 4:9bd10a0775e4 | semi-colon: 4:9bd10a0775e4 - * dd800401bd8c + o dd800401bd8c | Precursors: 4:9bd10a0775e4 | semi-colon: 4:9bd10a0775e4 | @ 9bd10a0775e4 @@ -1517,13 +1492,13 @@ o ea207398892e $ hg fatelog - * eceed8f98ffc + o eceed8f98ffc | - | * 0b997eb7ceee + | o 0b997eb7ceee | | - * | b18bc8331526 + o | b18bc8331526 |/ - * dd800401bd8c + o dd800401bd8c | | @ 9bd10a0775e4 |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc @@ -1551,8 +1526,6 @@ ------------ $ hg up "desc(A0)" --hidden - updating to a hidden changeset 471f378eab4c - (hidden revision '471f378eab4c' is pruned) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its parent successor)
--- a/tests/test-evolve-topic.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve-topic.t Mon Sep 03 22:59:19 2018 +0200 @@ -100,17 +100,17 @@ | | o 10 - {foo} d9cacd156ffc add ddd (draft) | | - | | * 9 - {bar} 1d964213b023 add jjj (draft) + | | o 9 - {bar} 1d964213b023 add jjj (draft) | | | - | | * 8 - {bar} fcab990f3261 add iii (draft) + | | o 8 - {bar} fcab990f3261 add iii (draft) | | | - | | * 7 - {bar} b0c2554835ac add hhh (draft) + | | o 7 - {bar} b0c2554835ac add hhh (draft) | | | - | | * 6 - {bar} c748293f1c1a add ggg (draft) + | | o 6 - {bar} c748293f1c1a add ggg (draft) | | | +---x 5 - {foo} 6a6b7365c751 add fff (draft) | | - * | 4 - {foo} 3969ab847d9c add eee (draft) + o | 4 - {foo} 3969ab847d9c add eee (draft) | | x | 3 - {foo} 4e3a154f38c7 add ddd (draft) |/ @@ -136,13 +136,13 @@ | o 10 - {foo} d9cacd156ffc add ddd (draft) | - | * 9 - {bar} 1d964213b023 add jjj (draft) + | o 9 - {bar} 1d964213b023 add jjj (draft) | | - | * 8 - {bar} fcab990f3261 add iii (draft) + | o 8 - {bar} fcab990f3261 add iii (draft) | | - | * 7 - {bar} b0c2554835ac add hhh (draft) + | o 7 - {bar} b0c2554835ac add hhh (draft) | | - | * 6 - {bar} c748293f1c1a add ggg (draft) + | o 6 - {bar} c748293f1c1a add ggg (draft) | | | x 5 - {foo} 6a6b7365c751 add fff (draft) | | @@ -251,7 +251,6 @@ o 0 - {} 199cc73e9a0b add aaa (draft) $ hg topic -r 070c5573d8f9 bar - 4 new orphan changesets changed topic on 1 changes $ hg up 16d6f664b17c switching to topic bar @@ -277,13 +276,13 @@ $ hg log --graph @ 18 - {bar} 793eb6370b2d add fff (draft) | - | * 17 - {bar} 9bf430c106b7 add jjj (draft) + | o 17 - {bar} 9bf430c106b7 add jjj (draft) | | - | * 16 - {bar} d2dc89c57700 add iii (draft) + | o 16 - {bar} d2dc89c57700 add iii (draft) | | - | * 15 - {bar} 20bc4d02aa62 add hhh (draft) + | o 15 - {bar} 20bc4d02aa62 add hhh (draft) | | - | * 14 - {bar} 16d6f664b17c add ggg (draft) + | o 14 - {bar} 16d6f664b17c add ggg (draft) | | | x 13 - {foo} 070c5573d8f9 add fff (draft) |/ @@ -313,15 +312,15 @@ working directory parent is obsolete! (20bc4d02aa62) (use 'hg evolve' to update to its successor: d834582d9ee3) $ hg log -Gr 14:: - * 19 - {bar} d834582d9ee3 add hhh (draft) + o 19 - {bar} d834582d9ee3 add hhh (draft) | - | * 17 - {bar} 9bf430c106b7 add jjj (draft) + | o 17 - {bar} 9bf430c106b7 add jjj (draft) | | - | * 16 - {bar} d2dc89c57700 add iii (draft) + | o 16 - {bar} d2dc89c57700 add iii (draft) | | | @ 15 - {bar} 20bc4d02aa62 add hhh (draft) |/ - * 14 - {bar} 16d6f664b17c add ggg (draft) + o 14 - {bar} 16d6f664b17c add ggg (draft) | ~ @@ -334,15 +333,13 @@ $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase= rebasing 16:d2dc89c57700 "add iii" (bar) - 1 new orphan changesets rebasing 17:9bf430c106b7 "add jjj" (bar) - 1 new orphan changesets $ hg log -Gr 42b49017ff90:: - * 21 - {bar} 7542e76aba2c add jjj (draft) + o 21 - {bar} 7542e76aba2c add jjj (draft) | - * 20 - {bar} 7858bd7e9906 add iii (draft) + o 20 - {bar} 7858bd7e9906 add iii (draft) | - * 19 - {bar} d834582d9ee3 add hhh (draft) + o 19 - {bar} d834582d9ee3 add hhh (draft) | | o 18 - {bar} 793eb6370b2d add fff (draft) | |
--- a/tests/test-evolve.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-evolve.t Mon Sep 03 22:59:19 2018 +0200 @@ -354,7 +354,7 @@ $ glog --hidden o 4:ba0ec09b1bab@default(draft) a nifty feature | - | * 3:6992c59c6b06@default(draft) another feature (child of 568a468b60fc) + | o 3:6992c59c6b06@default(draft) another feature (child of 568a468b60fc) | | | | x 2:73296a82292a@default(draft) another feature (child of 568a468b60fc) | |/ @@ -447,9 +447,9 @@ $ hg log -G --template '{rev} {troubles}\n' @ 10 | - | * 9 orphan + | o 9 orphan | | - | * 8 orphan + | o 8 orphan | | | x 7 |/ @@ -958,7 +958,7 @@ $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n' o 9 [default] a1__ | - | * 8 [mybranch] a3 + | o 8 [mybranch] a3 | | | @ 7 [mybranch] a2 | | @@ -992,7 +992,7 @@ | o 9:9f8b83c2e7f3@default(draft) a1__ | - | * 8:777c26ca5e78@mybranch(draft) a3 + | o 8:777c26ca5e78@mybranch(draft) a3 | | | x 7:eb07e22a0e63@mybranch(draft) a2 | | @@ -1012,7 +1012,7 @@ | @ 9 [default] a1__ | - | * 8 [mybranch] a3 + | o 8 [mybranch] a3 | | | x 7 [mybranch] a2 | | @@ -1032,7 +1032,7 @@ |/ o 9 testbookmark: a1__ - test | - | * 8 : a3 - test + | o 8 : a3 - test | | | x 7 : a2 - test | | @@ -1051,7 +1051,7 @@ |/ o 9 testbookmark: a1__ - test | - | * 8 : a3 - test + | o 8 : a3 - test | | | x 7 : a2 - test | | @@ -1112,9 +1112,9 @@ $ glog @ 16:0cf3707e8971@default(draft) a3 | - | * 15:daa1ff1c7fbd@default(draft) add gh + | o 15:daa1ff1c7fbd@default(draft) add gh | | - | | * 14:484fb3cfa7f2@default(draft) add gg + | | o 14:484fb3cfa7f2@default(draft) add gg | |/ | x 13:b88539ad24d7@default(draft) a3 |/ @@ -1254,8 +1254,6 @@ Shows "use 'hg evolve' to..." hints iff the evolve command is enabled $ hg --hidden up 14 - updating to a hidden changeset 484fb3cfa7f2 - (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272) 2 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (484fb3cfa7f2) $ cat >> $HGRCPATH <<EOF @@ -1263,8 +1261,6 @@ > evolutioncommands=evolve > EOF $ hg --hidden up 15 - updating to a hidden changeset daa1ff1c7fbd - (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (daa1ff1c7fbd) (use 'hg evolve' to update to its successor: 0c049e4e5422) @@ -1291,9 +1287,9 @@ $ glog -r "0cf3707e8971::" @ 22:274b6cd0c101@default(draft) add j1 | - | * 21:89e4f7e8feb5@default(draft) add j3 + | o 21:89e4f7e8feb5@default(draft) add j3 | | - | * 20:4cd61236beca@default(draft) add j2 + | o 20:4cd61236beca@default(draft) add j2 | | | x 19:0fd8bfb02de4@default(draft) add j1 |/ @@ -1331,9 +1327,9 @@ $ glog -r "0cf3707e8971::" @ 23:0ef9ff75f8e2@default(draft) add j1 | - | * 21:89e4f7e8feb5@default(draft) add j3 + | o 21:89e4f7e8feb5@default(draft) add j3 | | - | * 20:4cd61236beca@default(draft) add j2 + | o 20:4cd61236beca@default(draft) add j2 | | | x 19:0fd8bfb02de4@default(draft) add j1 |/ @@ -1465,7 +1461,7 @@ | o 31:2b5a32114b3d@default(draft) _oo | - | * 30:4d122571f3b6@default(draft) add uu + | o 30:4d122571f3b6@default(draft) add uu | | | x 29:7da3e73df8a5@default(draft) oo+pp |/ @@ -1575,8 +1571,6 @@ @ 1:ab832e43dd5a added a $ hg up f7ad41964313 --hidden - updating to a hidden changeset f7ad41964313 - (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (f7ad41964313) (use 'hg evolve' to update to its successor: ab832e43dd5a)
--- a/tests/test-exchange-obsmarkers-case-A3.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-A3.t Mon Sep 03 22:59:19 2018 +0200 @@ -74,7 +74,6 @@ created new head $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` obsoleted 1 changesets - 1 new orphan changesets $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` obsoleted 1 changesets $ hg log -G --hidden @@ -179,7 +178,6 @@ created new head $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` obsoleted 1 changesets - 1 new orphan changesets $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` obsoleted 1 changesets $ hg log -G --hidden @@ -250,7 +248,6 @@ remote: added 1 changesets with 1 changes to 1 files (+1 heads) remote: 1 new obsolescence markers remote: obsoleted 1 changesets - remote: 1 new orphan changesets ## post push state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} @@ -267,9 +264,9 @@ added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers obsoleted 1 changesets - 1 new orphan changesets new changesets e5ea8f9c7314 (run 'hg heads' to see heads, 'hg merge' to merge) + 1 new orphan changesets ## post pull state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-A4.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-A4.t Mon Sep 03 22:59:19 2018 +0200 @@ -65,11 +65,10 @@ $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'` $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` obsoleted 1 changesets - 1 new orphan changesets $ hg log -G --hidden @ e5ea8f9c7314 (draft): A1 | - | * 06055a7959d4 (draft): B + | o 06055a7959d4 (draft): B | | | x 28b51eb45704 (draft): A0 |/
--- a/tests/test-exchange-obsmarkers-case-B5.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-B5.t Mon Sep 03 22:59:19 2018 +0200 @@ -71,7 +71,6 @@ $ mkcommit B1 $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'` obsoleted 1 changesets - 2 new orphan changesets $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'` $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'` obsoleted 1 changesets @@ -81,7 +80,7 @@ | @ e5ea8f9c7314 (draft): A1 | - | * 1d0f3cd25300 (draft): C + | o 1d0f3cd25300 (draft): C | | | x 6e72f0a95b5e (draft): B0 | |
--- a/tests/test-exchange-obsmarkers-case-C4.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-C4.t Mon Sep 03 22:59:19 2018 +0200 @@ -67,7 +67,6 @@ $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'` obsoleted 1 changesets $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'` - 2 new content-divergent changesets $ hg prune -qd '0 0' . $ hg log -G --hidden x 7f7f229b13a6 (draft): C
--- a/tests/test-exchange-obsmarkers-case-D1.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-D1.t Mon Sep 03 22:59:19 2018 +0200 @@ -62,7 +62,6 @@ created new head $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` obsoleted 1 changesets - 1 new orphan changesets $ hg prune -d '0 0' 'desc(B)' 1 changesets pruned $ hg strip --hidden -q 'desc(A0)' --config devel.strip-obsmarkers=no
--- a/tests/test-exchange-obsmarkers-case-D4.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-D4.t Mon Sep 03 22:59:19 2018 +0200 @@ -60,7 +60,6 @@ $ mkcommit B1 $ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa obsoleted 1 changesets - 1 new orphan changesets $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'` $ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb obsoleted 1 changesets
--- a/tests/test-grab.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-grab.t Mon Sep 03 22:59:19 2018 +0200 @@ -108,7 +108,6 @@ $ hg pick 7c3bad9141dc picking 1:7c3bad9141dc "add b" - 1 new orphan changesets $ hg glog @ 5:7c15c05db6fa add b | @@ -116,7 +115,7 @@ | o 3:8e224524cd09 add x | - | * 2:4538525df7e2 add c + | o 2:4538525df7e2 add c | | | x 1:7c3bad9141dc add b |/ @@ -137,7 +136,7 @@ | o 3:8e224524cd09 add x | - | * 2:4538525df7e2 add c + | o 2:4538525df7e2 add c | | | x 1:7c3bad9141dc add b |/ @@ -221,11 +220,8 @@ $ echo foo > b $ hg ci -Aqm "foo to b" $ hg glog -r .^:: - @ 10:c437988de89f foo to b - | - o 8:44e155eb95c7 add c - | - ~ + hg: parse error at 4: not a prefix: end + [255] $ hg pick -r 7c15c05db6fa picking 5:7c15c05db6fa "add b"
--- a/tests/test-issue-5720.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-issue-5720.t Mon Sep 03 22:59:19 2018 +0200 @@ -49,7 +49,7 @@ $ hg log -G -T "{rev}: {phase}" @ 3: draft | - | * 2: secret + | o 2: secret | | | x 1: draft |/
--- a/tests/test-obsolete.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-obsolete.t Mon Sep 03 22:59:19 2018 +0200 @@ -121,8 +121,6 @@ 4 - 725c380fe99b $ hg up --hidden 3 -q - updating to a hidden changeset 0d3f46688ccc - (hidden revision '0d3f46688ccc' was rewritten as: 725c380fe99b) working directory parent is obsolete! (0d3f46688ccc) (reported by parents too) $ hg parents @@ -188,7 +186,6 @@ adding file changes added 5 changesets with 5 changes to 5 files (+1 heads) 2 new obsolescence markers - 1 new orphan changesets $ hg -R ../other-new verify checking changesets checking manifests @@ -212,8 +209,8 @@ $ hg up --hidden 3 -q working directory parent is obsolete! (0d3f46688ccc) $ mkcommit obsol_d # 6 + created new head 1 new orphan changesets - created new head $ hg debugobsolete `getid 5` `getid 6` obsoleted 1 changesets $ qlog @@ -271,8 +268,8 @@ $ hg up --hidden -q .^ # 3 working directory parent is obsolete! (0d3f46688ccc) $ mkcommit "obsol_d'" # 7 + created new head 1 new orphan changesets - created new head $ hg debugobsolete `getid 6` `getid 7` obsoleted 1 changesets $ hg pull -R ../other-new . @@ -362,8 +359,8 @@ $ hg up --hidden .^ -q # 3 working directory parent is obsolete! (0d3f46688ccc) $ mkcommit "obsol_d''" + created new head 1 new orphan changesets - created new head $ hg debugobsolete `getid 7` `getid 8` obsoleted 1 changesets $ cd ../other-new @@ -428,7 +425,6 @@ $ hg id -n 9 $ hg debugobsolete `getid 0` `getid 9` - 1 new phase-divergent changesets 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7 # at core level the warning is not issued # this is now a big issue now that we have bumped warning @@ -488,7 +484,7 @@ check rebase compat $ hg log -G --template='{rev} - {node|short} {desc}\n' - * 8 - 159dfc9fa5d3 add obsol_d'' + o 8 - 159dfc9fa5d3 add obsol_d'' | | o 4 - 725c380fe99b add obsol_c' | | @@ -502,7 +498,7 @@ $ hg log -G --template='{rev} - {node|short} {desc}\n' --hidden x 9 - 83b5778897ad add toto - * 8 - 159dfc9fa5d3 add obsol_d'' + o 8 - 159dfc9fa5d3 add obsol_d'' | | x 7 - 909a0fb57e5d add obsol_d' |/ @@ -536,9 +532,9 @@ $ hg log -G --template='{rev} - {node|short} {desc}\n' @ 11 - 9468a5f5d8b2 add obsol_d'' | - * 10 - 2033b4e49474 add obsol_c + o 10 - 2033b4e49474 add obsol_c | - * 4 - 725c380fe99b add obsol_c' + o 4 - 725c380fe99b add obsol_c' | o 1 - 7c3bad9141dc add b | @@ -557,7 +553,6 @@ added 2 changesets with 1 changes to [12] files (re) 3 new obsolescence markers obsoleted 1 changesets - 2 new content-divergent changesets $ hg up -q 10 $ mkcommit "obsol_d'''" created new head @@ -625,7 +620,7 @@ | date: Thu Jan 01 00:00:00 1970 +0000 | summary: add f | - | * changeset: 12:6db5e282cb91 + | o changeset: 12:6db5e282cb91 |/ parent: 10:2033b4e49474 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 @@ -688,7 +683,6 @@ phases: 3 draft phase-divergent: 1 changesets $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` - 2 new content-divergent changesets $ hg log -r 'contentdivergent()' changeset: 12:6db5e282cb91 parent: 10:2033b4e49474 @@ -707,8 +701,6 @@ $ hg up --hidden 3 -q - updating to a hidden changeset 0d3f46688ccc - (hidden revision '0d3f46688ccc' has diverged) working directory parent is obsolete! (0d3f46688ccc) $ hg evolve parent is obsolete with multiple successors: @@ -727,8 +719,6 @@ Check import reports new unstable changeset: $ hg up --hidden 2 - updating to a hidden changeset 4538525df7e2 - (hidden revision '4538525df7e2' has diverged) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (4538525df7e2) (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) @@ -749,7 +739,7 @@ | instability: orphan | summary: add obsol_d'' | - | * changeset: 15:50f11e5e3a63 + | o changeset: 15:50f11e5e3a63 | | parent: 11:9468a5f5d8b2 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 @@ -769,7 +759,7 @@ | | | obsolete: amended using amend as 14:705ab2a6b72e | | | summary: add f | | | - | | | * changeset: 12:6db5e282cb91 + | | | o changeset: 12:6db5e282cb91 | | |/ parent: 10:2033b4e49474 | | | user: test | | | date: Thu Jan 01 00:00:00 1970 +0000
--- a/tests/test-prev-next.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-prev-next.t Mon Sep 03 22:59:19 2018 +0200 @@ -252,7 +252,7 @@ | o 6:d7f119adc759 added b (3) | - | * 5:9df671ccd2c7 added d + | o 5:9df671ccd2c7 added d | | | x 3:9ad178109a19 added b (2) |/
--- a/tests/test-push-checkheads-partial-C2.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-push-checkheads-partial-C2.t Mon Sep 03 22:59:19 2018 +0200 @@ -61,11 +61,10 @@ created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` obsoleted 1 changesets - 1 new orphan changesets $ hg log -G --hidden @ f6082bc4ffef (draft): A1 | - | * d73caddc5533 (draft): B0 + | o d73caddc5533 (draft): B0 | | | x 8aaa48160adc (draft): A0 |/
--- a/tests/test-push-checkheads-partial-C4.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-push-checkheads-partial-C4.t Mon Sep 03 22:59:19 2018 +0200 @@ -61,11 +61,10 @@ created new head $ hg debugobsolete --record-parents `getid "desc(A0)"` obsoleted 1 changesets - 1 new orphan changesets $ hg log -G --hidden @ 0f88766e02d6 (draft): C0 | - | * d73caddc5533 (draft): B0 + | o d73caddc5533 (draft): B0 | | | x 8aaa48160adc (draft): A0 |/
--- a/tests/test-push-checkheads-pruned-B2.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-push-checkheads-pruned-B2.t Mon Sep 03 22:59:19 2018 +0200 @@ -61,7 +61,6 @@ created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` obsoleted 1 changesets - 1 new orphan changesets $ hg debugobsolete --record-parents `getid "desc(B0)"` obsoleted 1 changesets $ hg log -G --hidden
--- a/tests/test-push-checkheads-pruned-B3.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-push-checkheads-pruned-B3.t Mon Sep 03 22:59:19 2018 +0200 @@ -61,7 +61,6 @@ created new head $ hg debugobsolete --record-parents `getid "desc(A0)"` obsoleted 1 changesets - 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` obsoleted 1 changesets $ hg log -G --hidden
--- a/tests/test-push-checkheads-pruned-B4.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-push-checkheads-pruned-B4.t Mon Sep 03 22:59:19 2018 +0200 @@ -62,7 +62,6 @@ created new head $ hg debugobsolete --record-parents `getid "desc(A0)"` obsoleted 1 changesets - 1 new orphan changesets $ hg debugobsolete --record-parents `getid "desc(B0)"` obsoleted 1 changesets $ hg log -G --hidden
--- a/tests/test-push-checkheads-pruned-B5.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-push-checkheads-pruned-B5.t Mon Sep 03 22:59:19 2018 +0200 @@ -65,7 +65,6 @@ created new head $ hg debugobsolete --record-parents `getid "desc(A0)"` obsoleted 1 changesets - 2 new orphan changesets $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"` obsoleted 1 changesets $ hg debugobsolete --record-parents `getid "desc(C0)"`
--- a/tests/test-push-checkheads-pruned-B8.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-push-checkheads-pruned-B8.t Mon Sep 03 22:59:19 2018 +0200 @@ -68,7 +68,6 @@ created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` obsoleted 1 changesets - 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` obsoleted 1 changesets $ hg debugobsolete --record-parents `getid "desc(B1)"`
--- a/tests/test-push-checkheads-superceed-A2.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-push-checkheads-superceed-A2.t Mon Sep 03 22:59:19 2018 +0200 @@ -61,7 +61,6 @@ $ mkcommit B1 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` obsoleted 1 changesets - 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` obsoleted 1 changesets $ hg log -G --hidden
--- a/tests/test-push-checkheads-superceed-A3.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-push-checkheads-superceed-A3.t Mon Sep 03 22:59:19 2018 +0200 @@ -64,7 +64,6 @@ $ mkcommit A1 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` obsoleted 1 changesets - 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` obsoleted 1 changesets $ hg log -G --hidden
--- a/tests/test-push-checkheads-superceed-A6.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-push-checkheads-superceed-A6.t Mon Sep 03 22:59:19 2018 +0200 @@ -70,7 +70,6 @@ $ mkcommit B1 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` obsoleted 1 changesets - 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` obsoleted 1 changesets $ hg log -G --hidden
--- a/tests/test-push-checkheads-superceed-A7.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-push-checkheads-superceed-A7.t Mon Sep 03 22:59:19 2018 +0200 @@ -70,7 +70,6 @@ created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` obsoleted 1 changesets - 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` obsoleted 1 changesets $ hg log -G --hidden
--- a/tests/test-push-checkheads-unpushed-D2.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-push-checkheads-unpushed-D2.t Mon Sep 03 22:59:19 2018 +0200 @@ -65,7 +65,6 @@ created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` obsoleted 1 changesets - 1 new orphan changesets $ hg debugobsolete --record-parents `getid "desc(B0)"` obsoleted 1 changesets $ hg up 0
--- a/tests/test-push-checkheads-unpushed-D3.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-push-checkheads-unpushed-D3.t Mon Sep 03 22:59:19 2018 +0200 @@ -68,7 +68,6 @@ created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` obsoleted 1 changesets - 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` obsoleted 1 changesets $ hg log -G --hidden
--- a/tests/test-push-checkheads-unpushed-D4.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-push-checkheads-unpushed-D4.t Mon Sep 03 22:59:19 2018 +0200 @@ -84,7 +84,6 @@ $ mkcommit B1 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` obsoleted 1 changesets - 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` obsoleted 1 changesets $ hg log -G --hidden
--- a/tests/test-push-checkheads-unpushed-D5.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-push-checkheads-unpushed-D5.t Mon Sep 03 22:59:19 2018 +0200 @@ -73,7 +73,6 @@ created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` obsoleted 1 changesets - 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` obsoleted 1 changesets $ hg log -G --hidden @@ -108,6 +107,5 @@ added 1 changesets with 1 changes to 1 files 1 new obsolescence markers obsoleted 1 changesets - 1 new orphan changesets $ cd ../..
--- a/tests/test-rewind.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-rewind.t Mon Sep 03 22:59:19 2018 +0200 @@ -261,20 +261,19 @@ ````````````` $ hg rewind --hidden --to 'desc("c_B0")' --as-divergence - 2 new content-divergent changesets rewinded to 1 changesets $ hg debugobsolete 7e594302a05d3769b27be88fc3cdfd39d7498498 25c8f5ab0c3bb569ec672570f1a901be4c6f032b 0 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} 7e594302a05d3769b27be88fc3cdfd39d7498498 48acf2c0d9c8961859ce9a913671eb2adc9b057b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'} $ hg obslog --rev 'desc("c_B0")' - * 48acf2c0d9c8 (4) c_B0 + o 48acf2c0d9c8 (4) c_B0 | x 7e594302a05d (2) c_B0 rewritten(description, content) as 25c8f5ab0c3b using amend by test (Thu Jan 01 00:00:01 1970 +0000) rewritten(meta, date) as 48acf2c0d9c8 using rewind by test (Thu Jan 01 00:00:01 1970 +0000) $ hg log -G - * changeset: 4:48acf2c0d9c8 + o changeset: 4:48acf2c0d9c8 | tag: tip | parent: 1:579f120ba918 | user: test @@ -300,7 +299,7 @@ summary: c_ROOT $ hg log -G --hidden - * changeset: 4:48acf2c0d9c8 + o changeset: 4:48acf2c0d9c8 | tag: tip | parent: 1:579f120ba918 | user: test @@ -702,7 +701,6 @@ ````````````` $ hg rewind --hidden --to 'min(desc(c_B0))' --exact - 1 new orphan changesets rewinded to 1 changesets (1 changesets obsoleted) working directory is now at 96622b0702dd
--- a/tests/test-sharing.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-sharing.t Mon Sep 03 22:59:19 2018 +0200 @@ -485,13 +485,13 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers - 2 new content-divergent changesets new changesets e3f99ce9d9cd (run 'hg heads' to see heads, 'hg merge' to merge) + 2 new content-divergent changesets Figure SG09: multiple heads! divergence! oh my! $ hg --hidden shortlog -G -r 3:: - * 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice) + o 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice) | | @ 5:a360947f6faf draft fix bug 24 (v2 by bob) |/
--- a/tests/test-split.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-split.t Mon Sep 03 22:59:19 2018 +0200 @@ -203,7 +203,6 @@ created new head Done splitting? [yN] y - 2 new orphan changesets Stop before splitting the commit completely creates a commit with all the remaining changes
--- a/tests/test-stabilize-order.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-stabilize-order.t Mon Sep 03 22:59:19 2018 +0200 @@ -49,9 +49,9 @@ $ glog @ 5:005fe5914f78@default(draft) adda | - | * 4:22619daeed78@default(draft) addb + | o 4:22619daeed78@default(draft) addb | | - | | * 3:7a7552255fb5@default(draft) addc + | | o 3:7a7552255fb5@default(draft) addc | | | | | x 2:ef23d6ef94d6@default(draft) addb | |/ @@ -78,7 +78,7 @@ | o 5:005fe5914f78@default(draft) adda | - | * 3:7a7552255fb5@default(draft) addc + | o 3:7a7552255fb5@default(draft) addc | | | x 2:ef23d6ef94d6@default(draft) addb | | @@ -140,7 +140,7 @@ $ glog @ 8:7a68bc4596ea@default(draft) addb | - | * 7:0f691739f917@default(draft) addc + | o 7:0f691739f917@default(draft) addc | | | x 6:81b8bbcd5892@default(draft) addb |/ @@ -203,14 +203,14 @@ | date: Thu Jan 01 00:00:00 1970 +0000 | summary: newmessage | - | * changeset: 11:fa68011f392e + | o changeset: 11:fa68011f392e | | parent: 9:2256dae6521f | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | instability: orphan | | summary: secondambiguous | | - | | * changeset: 10:bdc003b6eec2 + | | o changeset: 10:bdc003b6eec2 | |/ user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | instability: orphan
--- a/tests/test-stabilize-result.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-stabilize-result.t Mon Sep 03 22:59:19 2018 +0200 @@ -237,8 +237,6 @@ $ echo 'babar' >> a $ hg amend $ hg up --hidden 3932c176bbaa - updating to a hidden changeset 3932c176bbaa - (hidden revision '3932c176bbaa' was rewritten as: d2f173e25686) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (3932c176bbaa) (use 'hg evolve' to update to its successor: d2f173e25686) @@ -251,7 +249,7 @@ $ glog @ 14:eacc9c8240fe@default(draft) bk:[] More addition | - | * 13:d2f173e25686@default(draft) bk:[] More addition + | o 13:d2f173e25686@default(draft) bk:[] More addition |/ | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: | | @@ -345,8 +343,6 @@ ------------------------------------------------- $ hg up --hidden 3932c176bbaa - updating to a hidden changeset 3932c176bbaa - (hidden revision '3932c176bbaa' was rewritten as: 4d6ed26797bc) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (3932c176bbaa) (use 'hg evolve' to update to its successor: 4d6ed26797bc) @@ -362,7 +358,7 @@ $ glog @ 17:0b336205a5d0@default(draft) bk:[] More addition (2) | - | * 15:4d6ed26797bc@default(draft) bk:[] More addition + | o 15:4d6ed26797bc@default(draft) bk:[] More addition |/ | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: | |
--- a/tests/test-stack-branch.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-stack-branch.t Mon Sep 03 22:59:19 2018 +0200 @@ -109,13 +109,12 @@ $ echo bbb > ddd $ hg commit --amend - 2 new orphan changesets $ hg log -G @ 6 foo {} draft c_d | - | * 5 foo {} draft c_f + | o 5 foo {} draft c_f | | - | * 4 foo {} draft c_e + | o 4 foo {} draft c_e | | | x 3 foo {} draft c_d |/ @@ -226,7 +225,6 @@ 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ echo ccc > ddd $ hg commit --amend -m 'c_D' - 4 new orphan changesets $ hg rebase -d . -s 'desc(c_g)' rebasing 9:2ebb6e48ab8a "c_g" rebasing 10:634f38e27a1d "c_h" @@ -237,9 +235,9 @@ | @ 11 foo {} draft c_D | - | * 8 foo {} draft c_f + | o 8 foo {} draft c_f | | - | * 7 foo {} draft c_e + | o 7 foo {} draft c_e | | | x 6 foo {} draft c_d |/ @@ -271,9 +269,9 @@ | @ 11 foo {} draft c_D | - | * 8 foo {} draft c_f + | o 8 foo {} draft c_f | | - | * 7 foo {} draft c_e + | o 7 foo {} draft c_e | | | x 6 foo {} draft c_d |/
--- a/tests/test-topic-change.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-topic-change.t Mon Sep 03 22:59:19 2018 +0200 @@ -148,7 +148,6 @@ Changing topic in between the stack $ hg topic -r 9::10 --current - 5 new orphan changesets changed topic on 2 changes $ hg glog o 22:1b88140feefe {foobar} @@ -160,16 +159,16 @@ | @ 20:c2d6b7df5dcf {foobar} | | Added h () | | - | * 18:e7b418d79a05 {bar} + | o 18:e7b418d79a05 {bar} | | Added g () | | - | * 17:82e0b14f4d9e {bar} + | o 17:82e0b14f4d9e {bar} | | Added f () | | - | * 16:edc4a6b9ea60 {bar} + | o 16:edc4a6b9ea60 {bar} | | Added e () | | - | * 11:1315a3808ed0 {foo} + | o 11:1315a3808ed0 {foo} | | Added d () | | | x 10:1fa891977a22 {foo} @@ -375,14 +374,13 @@ $ hg topic -r . watwat switching to topic watwat - 1 new orphan changesets changed topic on 1 changes $ hg glog @ 33:894983f69e69 {watwat} | Added g () | - | * 32:1b83d11095b9 {movebook} + | o 32:1b83d11095b9 {movebook} | | Added h (book bookboo) | | | x 26:7c76c271395f {bar}
--- a/tests/test-topic-debugcb.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-topic-debugcb.t Mon Sep 03 22:59:19 2018 +0200 @@ -255,12 +255,11 @@ changed topic to "bar" on 2 revisions switching to topic foo changed topic to "foo" on 2 revisions - 2 new orphan changesets $ hg log -G @ [9:b14d13efcfa7] E | topic: foo - * [8:c89ca6e70978] D + o [8:c89ca6e70978] D | topic: foo | o [7:a3ea0dfe6a10] C | | topic: bar
--- a/tests/test-topic-stack-complex.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-topic-stack-complex.t Mon Sep 03 22:59:19 2018 +0200 @@ -81,7 +81,6 @@ examine changes to 'd'? [Ynesfdaq?] n Done splitting? [yN] y - 1 new orphan changesets $ hg stack ### topic: foo @@ -95,7 +94,7 @@ $ hg show work @ 5cce (foo) split2 o f26c (foo) split1 - | * f1d3 (foo) Added e and f + | o f1d3 (foo) Added e and f | x 8e82 (foo) Added c and d |/ o 002b (foo) Added a and b @@ -117,10 +116,10 @@ 1 new orphan changesets $ hg show work @ 7d94 (foo) split1 - | * 5cce (foo) split2 + | o 5cce (foo) split2 | x f26c (foo) split1 |/ - | * f1d3 (foo) Added e and f + | o f1d3 (foo) Added e and f | x 8e82 (foo) Added c and d |/ o 002b (foo) Added a and b
--- a/tests/test-topic-stack-data.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-topic-stack-data.t Mon Sep 03 22:59:19 2018 +0200 @@ -75,7 +75,6 @@ $ hg up 'desc(fuz_a)' 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ hg commit --amend --message 'fuz1_a' - 2 new orphan changesets A topic with multiple heads @@ -95,7 +94,6 @@ $ hg up 'desc(bar_d)' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg commit --amend --message 'bar1_d' - 1 new orphan changesets topic 'foo' on the multi headed branch @@ -127,7 +125,7 @@ | | o bar1_d (default) [bar] | | - | | * add bar_e (default) [bar] + | | o add bar_e (default) [bar] | | | | | x add bar_d (default) [bar] | |/ @@ -139,9 +137,9 @@ | | | | o fuz1_a (default) [fuz] | | | - | | | * add fuz_c (default) [fuz] + | | | o add fuz_c (default) [fuz] | | | | - | | | * add fuz_b (default) [fuz] + | | | o add fuz_b (default) [fuz] | | | | | | | x add fuz_a (default) [fuz] | | |/
--- a/tests/test-topic-stack.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-topic-stack.t Mon Sep 03 22:59:19 2018 +0200 @@ -267,13 +267,12 @@ $ echo bbb > ddd $ hg commit --amend - 2 new orphan changesets $ hg log -G @ 6 default {foo} draft c_d | - | * 5 default {foo} draft c_f + | o 5 default {foo} draft c_f | | - | * 4 default {foo} draft c_e + | o 4 default {foo} draft c_e | | | x 3 default {foo} draft c_d |/ @@ -402,7 +401,6 @@ 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ echo ccc > ddd $ hg commit --amend -m 'c_D' - 4 new orphan changesets $ hg rebase -d . -s 'desc(c_g)' rebasing 9:81264ae8a36a "c_g" (foo) rebasing 10:fde5f5941642 "c_h" (foo) @@ -413,9 +411,9 @@ | @ 11 default {foo} draft c_D | - | * 8 default {foo} draft c_f + | o 8 default {foo} draft c_f | | - | * 7 default {foo} draft c_e + | o 7 default {foo} draft c_e | | | x 6 default {foo} draft c_d |/ @@ -456,9 +454,9 @@ | @ 11 default {foo} draft c_D | - | * 8 default {foo} draft c_f + | o 8 default {foo} draft c_f | | - | * 7 default {foo} draft c_e + | o 7 default {foo} draft c_e | | | x 6 default {foo} draft c_d |/ @@ -493,20 +491,19 @@ Changing topics on some commits in between $ hg topic foobar -r 'desc(c_e) + desc(c_D)' switching to topic foobar - 4 new orphan changesets changed topic on 2 changes $ hg log -G @ 17 default {foobar} draft c_D | - | * 16 default {foobar} draft c_e + | o 16 default {foobar} draft c_e | | - | | * 15 default {foo} draft c_f + | | o 15 default {foo} draft c_f | | | | | x 14 default {foo} draft c_e | |/ - | * 13 default {foo} draft c_h + | o 13 default {foo} draft c_h | | - | * 12 default {foo} draft c_g + | o 12 default {foo} draft c_g | | | x 11 default {foo} draft c_D |/ @@ -519,7 +516,6 @@ $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()' rebasing 15:77082e55de88 "c_f" (foo) switching to topic foo - 1 new orphan changesets switching to topic foobar $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()' rebasing 12:0c3e8aed985d "c_g" (foo) @@ -673,7 +669,6 @@ switching to topic red 0 files updated, 0 files merged, 6 files removed, 0 files unresolved $ hg commit --amend --user test2 - 7 new orphan changesets $ hg up 'desc("c_C")' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg commit --amend --user test2 @@ -685,21 +680,21 @@ $ hg log -G --rev 'sort(all(), "topo")' @ 11 default {blue} draft c_D | - | * 8 default {blue} draft c_I + | o 8 default {blue} draft c_I | | - | * 7 default {red} draft c_H + | o 7 default {red} draft c_H | |\ - | | * 6 default {blue} draft c_G + | | o 6 default {blue} draft c_G | | | - | | * 5 default {red} draft c_F + | | o 5 default {red} draft c_F | | | - | | * 4 default {red} draft c_E + | | o 4 default {red} draft c_E | | | | x | 3 default {blue} draft c_D |/ / x / 2 default {red} draft c_C |/ - | * 10 default {red} draft c_C + | o 10 default {red} draft c_C |/ x 1 default {red} draft c_B | @@ -755,25 +750,25 @@ $ hg log -G --rev 'sort(all(), "topo")' @ 16 default {blue} draft c_D | - | * 13 default {blue} draft c_G + | o 13 default {blue} draft c_G | | - | | * 12 default {red} draft c_H + | | o 12 default {red} draft c_H | | |\ - | | | | * 8 default {blue} draft c_I + | | | | o 8 default {blue} draft c_I | | | | | | | +---x 7 default {red} draft c_H | | | |/ | +---x 6 default {blue} draft c_G | | | - | * | 5 default {red} draft c_F + | o | 5 default {red} draft c_F | | | - | * | 4 default {red} draft c_E + | o | 4 default {red} draft c_E | | | +---x 3 default {blue} draft c_D | | x | 2 default {red} draft c_C |/ - | * 15 default {red} draft c_C + | o 15 default {red} draft c_C |/ x 1 default {red} draft c_B | @@ -834,7 +829,6 @@ $ echo zzz > Z $ hg add Z $ hg commit --amend - 1 new orphan changesets $ hg status --change . A Z A ggg @@ -877,13 +871,13 @@ | rewritten(parent, content) as dde94df880e9, e7ea874afbd5 using split by test (Thu Jan 01 00:00:00 1970 +0000) | x 907f7d3c2333 (18) c_G - | rewritten(content) as b24bab30ac12 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + | rewritten as b24bab30ac12 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | x 3ab2eedae500 (13) c_G - | rewritten(parent) as 907f7d3c2333 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) + | rewritten as 907f7d3c2333 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) | x c7d60a180d05 (6) c_G - rewritten(user) as 3ab2eedae500 using amend by test (Thu Jan 01 00:00:00 1970 +0000) + rewritten as 3ab2eedae500 using amend by test (Thu Jan 01 00:00:00 1970 +0000) $ hg export . # HG changeset patch
--- a/tests/test-topic-tutorial.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-topic-tutorial.t Mon Sep 03 22:59:19 2018 +0200 @@ -1226,14 +1226,14 @@ | date: Thu Jan 01 00:00:00 1970 +0000 | summary: Adding apple juice | - | * changeset: 15:bb1e6254f532 + | o changeset: 15:bb1e6254f532 | | topic: tools | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | instability: orphan | | summary: Adding drill | | - | * changeset: 14:d4f97f32f8a1 + | o changeset: 14:d4f97f32f8a1 | | topic: tools | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000
--- a/tests/test-topic.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-topic.t Mon Sep 03 22:59:19 2018 +0200 @@ -515,7 +515,7 @@ merging alpha warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1] $ hg revert -r narf alpha $ hg resolve -m alpha
--- a/tests/test-touch.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-touch.t Mon Sep 03 22:59:19 2018 +0200 @@ -32,8 +32,6 @@ $ hg add b $ hg commit -m ab --amend $ hg up --hidden 1 - updating to a hidden changeset [0-9a-f]{12} (re) - (hidden revision '*' was rewritten as: *) (glob) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (*) (glob) (use 'hg evolve' to update to its successor: *) (glob) @@ -50,7 +48,7 @@ $ hg log -G @ 3:[0-9a-f]{12} a (re) - \* 2:[0-9a-f]{12} ab (re) + o 2:[0-9a-f]{12} ab (re) $ hg prune 3 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -114,7 +112,7 @@ $ hg log -G --hidden @ 11:[0-9a-f]{12} gna1 (re) | - . \* 10:[0-9a-f]{12} move (re) + . o 10:[0-9a-f]{12} move (re) | | . x 9:[0-9a-f]{12} gna1 (re) |/
--- a/tests/test-tutorial.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-tutorial.t Mon Sep 03 22:59:19 2018 +0200 @@ -1211,15 +1211,15 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - 1 new orphan changesets new changesets e4e4fa805d92 (run 'hg update' to get a working copy) + 1 new orphan changesets The new changeset "animal" is based on an old changeset of "bathroom". You can see both version showing up in the log. $ hg log -G - * e4e4fa805d92 (draft): animals + o e4e4fa805d92 (draft): animals | | @ 682004e81e71 (draft): bathroom stuff | | @@ -1682,7 +1682,7 @@ is neither dead or obsolete. My repository is in an unstable state again. $ hg log -G - * fc41faf45288 (draft): SPAM SPAM SPAM + o fc41faf45288 (draft): SPAM SPAM SPAM | x 2a2b36e14660 (draft): animals |
--- a/tests/test-uncommit.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-uncommit.t Mon Sep 03 22:59:19 2018 +0200 @@ -238,8 +238,6 @@ Test phase is preserved, no local changes $ hg up -C 3 --hidden - updating to a hidden changeset 5eb72dbe0cb4 - (hidden revision '5eb72dbe0cb4' was rewritten as: e8db4aa611f6) 8 files updated, 0 files merged, 1 files removed, 0 files unresolved (leaving bookmark touncommit-bm) working directory parent is obsolete! (5eb72dbe0cb4) @@ -270,7 +268,7 @@ $ glog --hidden @ 5:a1d4c1ad76cc@bar(draft) touncommit | - | * 4:e8db4aa611f6@bar(draft) touncommit + | o 4:e8db4aa611f6@bar(draft) touncommit |/ | x 3:5eb72dbe0cb4@bar(obsolete/draft) touncommit |/ @@ -287,8 +285,6 @@ Test --all $ hg up -C 3 --hidden - updating to a hidden changeset 5eb72dbe0cb4 - (hidden revision '5eb72dbe0cb4' has diverged) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (5eb72dbe0cb4) (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
--- a/tests/test-unstable.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-unstable.t Mon Sep 03 22:59:19 2018 +0200 @@ -46,7 +46,7 @@ $ hg log -G @ 3:36050226a9b9@default(draft) bprime | - | * 2:102002290587@default(draft) add _c + | o 2:102002290587@default(draft) add _c | | | x 1:37445b16603b@default(draft) add _b |/ @@ -97,7 +97,7 @@ | o 5:8ffdae67d696@default(draft) add bsecondsplit1 | - | * 2:102002290587@default(draft) add _c + | o 2:102002290587@default(draft) add _c | | | x 1:37445b16603b@default(draft) add _b |/
--- a/tests/test-userguide.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-userguide.t Mon Sep 03 22:59:19 2018 +0200 @@ -170,9 +170,9 @@ $ hg --hidden shortlog -G -r 171c6a79a27b:: @ 13:395cbeda3a06 draft fix bug 17 | - | * 12:dadcbba2d606 draft feature 23 + | o 12:dadcbba2d606 draft feature 23 | | - | * 11:debd46bb29dc draft cleanup + | o 11:debd46bb29dc draft cleanup | | | x 10:3e1cb8f70c02 draft fix bug 17 |/ @@ -298,7 +298,7 @@ | o 26:2594e98553a9 draft fix a bug | - | * 25:fbb3c6d50427 draft new feature + | o 25:fbb3c6d50427 draft new feature | | | x 24:5b31a1239ab9 draft fix a bug |/
--- a/tests/test-wireproto.t Mon Sep 03 22:59:18 2018 +0200 +++ b/tests/test-wireproto.t Mon Sep 03 22:59:19 2018 +0200 @@ -195,7 +195,7 @@ $ cat hg.pid >> $DAEMON_PIDS $ curl -s http://localhost:$HGPORT/?cmd=capabilities - _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob) + _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob) Check we cannot use pushkey for marker exchange anymore