--- a/tests/test-discovery-obshashrange.t Mon Jan 15 21:45:46 2018 +0100
+++ b/tests/test-discovery-obshashrange.t Mon Jan 15 21:47:40 2018 +0100
@@ -178,7 +178,7 @@
running python "*/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob)
sending hello command
sending between command
- remote: 495
+ remote: 483
remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch * (glob)
remote: 1
preparing listkeys for "phases"
@@ -213,7 +213,7 @@
45f8b879de922f6a6e620ba04205730335b6fc7e
sending unbundle command
bundle2-output-bundle: "HG20", 4 parts total
- bundle2-output-part: "replycaps" 195 bytes payload
+ bundle2-output-part: "replycaps" 185 bytes payload
bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
bundle2-output-part: "phase-heads" 24 bytes payload
bundle2-output-part: "obsmarkers" streamed payload
--- a/tests/test-divergent.t Mon Jan 15 21:45:46 2018 +0100
+++ b/tests/test-divergent.t Mon Jan 15 21:47:40 2018 +0100
@@ -49,7 +49,7 @@
$ hg log -G
@ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent]
|
- | * 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent]
+ | o 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent]
|/
o 0:135f39f4bd78@default(draft) add _a []
@@ -92,7 +92,7 @@
$ hg log -G
@ 7:0a768ef678d9@default(draft) cdivergent2 [content-divergent]
|
- | * 6:26c7705fee96@default(draft) add cdivergent1 [content-divergent]
+ | o 6:26c7705fee96@default(draft) add cdivergent1 [content-divergent]
|/
| o 4:c26f1d3baed2@default(draft) add bdivergent1 []
|/
@@ -129,7 +129,7 @@
$ hg log -G
@ 3:e708fd28d5cf@default(draft) add bdivergent2 [content-divergent]
|
- | * 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent]
+ | o 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent]
|/
o 0:135f39f4bd78@default(draft) add _a []
--- a/tests/test-evolve-obshistory-complex.t Mon Jan 15 21:45:46 2018 +0100
+++ b/tests/test-evolve-obshistory-complex.t Mon Jan 15 21:47:40 2018 +0100
@@ -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
@@ -250,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
@@ -326,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
@@ -382,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 by test (*) (glob)
@@ -410,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 by test (*) (glob)
--- a/tests/test-evolve-obshistory.t Mon Jan 15 21:45:46 2018 +0100
+++ b/tests/test-evolve-obshistory.t Mon Jan 15 21:47:40 2018 +0100
@@ -203,7 +203,6 @@
(use --hidden to access hidden revisions; successor: 4ae3a4151de9)
[255]
$ hg update --hidden "desc(A0)"
- updating to a hidden changeset 471f378eab4c
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)
@@ -304,7 +303,6 @@
(use --hidden to access hidden revisions; pruned)
[255]
$ hg up --hidden -r 'desc(B0)'
- updating to a hidden changeset 0dec01379d3b
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)
@@ -501,7 +499,6 @@
(use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
[255]
$ hg update --hidden 'min(desc(A0))'
- updating to a hidden changeset 471597cad322
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)
@@ -779,7 +776,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
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)
@@ -1001,7 +997,6 @@
(use --hidden to access hidden revisions; successor: eb5a0daa2192)
[255]
$ hg update --hidden 'desc(A0)'
- updating to a hidden changeset 471f378eab4c
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)
@@ -1010,7 +1005,6 @@
(use --hidden to access hidden revisions; successor: eb5a0daa2192)
[255]
$ hg update --hidden 'desc(B0)'
- updating to a hidden changeset 0dec01379d3b
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)
@@ -1046,7 +1040,6 @@
summary: ROOT
$ hg update --hidden 'desc(A0)'
- updating to a hidden changeset 471f378eab4c
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)
@@ -1061,7 +1054,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
@@ -1108,7 +1101,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 by test (*) (glob)
@@ -1169,7 +1162,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 by test (*) (glob)
@@ -1194,7 +1187,7 @@
$ hg obslog fdf9bde5129a -a --patch
@ 65b757b745b9 (3) A2
|
- | * fdf9bde5129a (2) A1
+ | o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
rewritten(description) as 65b757b745b9 by test (*) (glob)
@@ -1241,7 +1234,7 @@
$ hg obslog 65b757b745b9 -a --patch
@ 65b757b745b9 (3) A2
|
- | * fdf9bde5129a (2) A1
+ | o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
rewritten(description) as 65b757b745b9 by test (*) (glob)
@@ -1266,7 +1259,7 @@
$ hg obslog '65b757b745b9+fdf9bde5129a' --patch
@ 65b757b745b9 (3) A2
|
- | * fdf9bde5129a (2) A1
+ | o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
rewritten(description) as 65b757b745b9 by test (*) (glob)
@@ -1341,7 +1334,6 @@
(use --hidden to access hidden revisions; diverged)
[255]
$ hg update --hidden 'desc(A0)'
- updating to a hidden changeset 471f378eab4c
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)
@@ -1568,12 +1560,10 @@
(use --hidden to access hidden revisions; successor: eb5a0daa2192)
[255]
$ hg update --hidden 'desc(A0)'
- updating to a hidden changeset 471f378eab4c
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
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-order.t Mon Jan 15 21:45:46 2018 +0100
+++ b/tests/test-evolve-order.t Mon Jan 15 21:47:40 2018 +0100
@@ -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-phase.t Mon Jan 15 21:45:46 2018 +0100
+++ b/tests/test-evolve-phase.t Mon Jan 15 21:47:40 2018 +0100
@@ -75,7 +75,7 @@
$ hg glog
@ 3 - 87495ea7c9ec b (draft)
|
- | * 2 - 13833940840c c (secret)
+ | o 2 - 13833940840c c (secret)
| |
| x 1 - 1e6c11564562 b (draft)
|/
@@ -105,7 +105,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 Jan 15 21:45:46 2018 +0100
+++ b/tests/test-evolve-split.t Mon Jan 15 21:47:40 2018 +0100
@@ -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-templates.t Mon Jan 15 21:45:46 2018 +0100
+++ b/tests/test-evolve-templates.t Mon Jan 15 21:47:40 2018 +0100
@@ -64,7 +64,6 @@
Check templates
---------------
$ hg up 'desc(A0)' --hidden
- updating to a hidden changeset 471f378eab4c
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,7 +155,6 @@
$ hg up 'desc(A1)' --hidden
- updating to a hidden changeset a468dc9b3633
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)
@@ -341,7 +339,6 @@
---------------
$ hg up 'obsolete()' --hidden
- updating to a hidden changeset 471597cad322
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)
@@ -481,7 +478,6 @@
---------------
$ hg up 'desc(A0)' --hidden
- updating to a hidden changeset 471f378eab4c
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)
@@ -507,7 +503,6 @@
o ea207398892e
$ hg up 'desc(B0)' --hidden
- updating to a hidden changeset 0dec01379d3b
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)
@@ -623,7 +618,6 @@
summary: ROOT
$ hg update --hidden 'desc(A0)'
- updating to a hidden changeset 471f378eab4c
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)
@@ -638,7 +632,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
@@ -663,17 +657,16 @@
---------------
$ hg up 'desc(A0)' --hidden
- updating to a hidden changeset 471f378eab4c
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
@@ -685,9 +678,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
@@ -700,7 +693,7 @@
Precursors template should not show precursors as it's not displayed in the
log
$ hg tlog
- * 019fadeab383
+ o 019fadeab383
|
| @ fdf9bde5129a
|/
@@ -708,7 +701,7 @@
$ hg fatelog
- * 019fadeab383
+ o 019fadeab383
|
| @ fdf9bde5129a
|/
@@ -716,7 +709,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
@@ -738,7 +731,7 @@
o ea207398892e
$ hg fatelog --hidden
- * 019fadeab383
+ o 019fadeab383
|
| x 65b757b745b9
|/ Obsfate: reworded using amend as 4:019fadeab383
@@ -752,7 +745,7 @@
$ hg fatelogjson --hidden
- * 019fadeab383 []
+ o 019fadeab383 []
|
| x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}]
|/
@@ -838,7 +831,6 @@
---------------
$ hg up 'desc(A0)' --hidden
- updating to a hidden changeset 471f378eab4c
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)
@@ -862,7 +854,6 @@
o ea207398892e
$ hg up 'desc(B0)' --hidden
- updating to a hidden changeset 0dec01379d3b
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)
@@ -895,7 +886,6 @@
$ hg up 'desc(B1)' --hidden
- updating to a hidden changeset b7ea6d14e664
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)
@@ -1171,7 +1161,6 @@
o ea207398892e
$ hg up -r "desc(B0)" --hidden
- updating to a hidden changeset 0dec01379d3b
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)
@@ -1386,14 +1375,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
@@ -1406,7 +1395,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
@@ -1431,10 +1420,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
@@ -1442,7 +1431,7 @@
| Fate: reworded using amend as 8:b18bc8331526
| Fate: reworded using amend as 9:0b997eb7ceee
|
- * dd800401bd8c
+ o dd800401bd8c
|
o f897c6137566
|
@@ -1451,14 +1440,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
|
@@ -1468,10 +1457,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
@@ -1482,7 +1471,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
@@ -1513,14 +1502,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
@@ -1536,23 +1525,22 @@
o ea207398892e
$ hg up --hidden 4
- updating to a hidden changeset 9bd10a0775e4
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
@@ -1566,13 +1554,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
@@ -1600,7 +1588,6 @@
------------
$ hg up "desc(A0)" --hidden
- updating to a hidden changeset 471f378eab4c
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 Jan 15 21:45:46 2018 +0100
+++ b/tests/test-evolve-topic.t Mon Jan 15 21:47:40 2018 +0100
@@ -98,17 +98,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)
|/
@@ -134,13 +134,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)
| |
--- a/tests/test-evolve.t Mon Jan 15 21:45:46 2018 +0100
+++ b/tests/test-evolve.t Mon Jan 15 21:47:40 2018 +0100
@@ -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
|/
@@ -957,7 +957,7 @@
$ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
o 9 [default] a1__
|
- | * 8 [mybranch] a3
+ | o 8 [mybranch] a3
| |
| @ 7 [mybranch] a2
| |
@@ -991,7 +991,7 @@
|
o 9:9f8b83c2e7f3@default(draft) a1__
|
- | * 8:777c26ca5e78@mybranch(draft) a3
+ | o 8:777c26ca5e78@mybranch(draft) a3
| |
| x 7:eb07e22a0e63@mybranch(draft) a2
| |
@@ -1011,7 +1011,7 @@
|
@ 9 [default] a1__
|
- | * 8 [mybranch] a3
+ | o 8 [mybranch] a3
| |
| x 7 [mybranch] a2
| |
@@ -1031,7 +1031,7 @@
|/
o 9 testbookmark: a1__ - test
|
- | * 8 : a3 - test
+ | o 8 : a3 - test
| |
| x 7 : a2 - test
| |
@@ -1050,7 +1050,7 @@
|/
o 9 testbookmark: a1__ - test
|
- | * 8 : a3 - test
+ | o 8 : a3 - test
| |
| x 7 : a2 - test
| |
@@ -1111,9 +1111,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
|/
@@ -1272,9 +1272,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
|/
@@ -1312,9 +1312,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
|/
@@ -1446,7 +1446,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
|/
@@ -1526,7 +1526,7 @@
|
o 37:df89d30f23e2@default(draft) amended
|
- | * 36:59c37c5bebd1@default(draft) will cause conflict at evolve
+ | o 36:59c37c5bebd1@default(draft) will cause conflict at evolve
| |
| x 35:7cc12c6c7862@default(draft) will be evolved safely
| |
--- a/tests/test-exchange-obsmarkers-case-A4.t Mon Jan 15 21:45:46 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-A4.t Mon Jan 15 21:47:40 2018 +0100
@@ -68,7 +68,7 @@
$ 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 Jan 15 21:45:46 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-B5.t Mon Jan 15 21:47:40 2018 +0100
@@ -80,7 +80,7 @@
|
@ e5ea8f9c7314 (draft): A1
|
- | * 1d0f3cd25300 (draft): C
+ | o 1d0f3cd25300 (draft): C
| |
| x 6e72f0a95b5e (draft): B0
| |
--- a/tests/test-issue-5720.t Mon Jan 15 21:45:46 2018 +0100
+++ b/tests/test-issue-5720.t Mon Jan 15 21:47:40 2018 +0100
@@ -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 Jan 15 21:45:46 2018 +0100
+++ b/tests/test-obsolete.t Mon Jan 15 21:47:40 2018 +0100
@@ -121,7 +121,6 @@
4
- 725c380fe99b
$ hg up --hidden 3 -q
- updating to a hidden changeset 0d3f46688ccc
working directory parent is obsolete! (0d3f46688ccc)
(reported by parents too)
$ hg parents
@@ -485,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'
| |
@@ -499,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'
|/
@@ -533,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
|
@@ -621,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
@@ -702,7 +701,6 @@
$ hg up --hidden 3 -q
- updating to a hidden changeset 0d3f46688ccc
working directory parent is obsolete! (0d3f46688ccc)
$ hg evolve
parent is obsolete with multiple successors:
@@ -721,7 +719,6 @@
Check import reports new unstable changeset:
$ hg up --hidden 2
- updating to a hidden changeset 4538525df7e2
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)
@@ -742,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
@@ -762,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-push-checkheads-partial-C2.t Mon Jan 15 21:45:46 2018 +0100
+++ b/tests/test-push-checkheads-partial-C2.t Mon Jan 15 21:47:40 2018 +0100
@@ -64,7 +64,7 @@
$ 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 Jan 15 21:45:46 2018 +0100
+++ b/tests/test-push-checkheads-partial-C4.t Mon Jan 15 21:47:40 2018 +0100
@@ -64,7 +64,7 @@
$ hg log -G --hidden
@ 0f88766e02d6 (draft): C0
|
- | * d73caddc5533 (draft): B0
+ | o d73caddc5533 (draft): B0
| |
| x 8aaa48160adc (draft): A0
|/
--- a/tests/test-sharing.t Mon Jan 15 21:45:46 2018 +0100
+++ b/tests/test-sharing.t Mon Jan 15 21:47:40 2018 +0100
@@ -491,7 +491,7 @@
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-stabilize-conflict.t Mon Jan 15 21:45:46 2018 +0100
+++ b/tests/test-stabilize-conflict.t Mon Jan 15 21:47:40 2018 +0100
@@ -142,7 +142,7 @@
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: babar count up to ten
|
- | * changeset: 4:71c18f70c34f
+ | o changeset: 4:71c18f70c34f
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | instability: orphan
@@ -234,7 +234,7 @@
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: babar count up to ten
|
- | * changeset: 6:1836b91c6c1d
+ | o changeset: 6:1836b91c6c1d
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | instability: orphan
--- a/tests/test-stabilize-order.t Mon Jan 15 21:45:46 2018 +0100
+++ b/tests/test-stabilize-order.t Mon Jan 15 21:47:40 2018 +0100
@@ -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
| |
@@ -141,7 +141,7 @@
$ glog
@ 8:7a68bc4596ea@default(draft) addb
|
- | * 7:0f691739f917@default(draft) addc
+ | o 7:0f691739f917@default(draft) addc
| |
| x 6:81b8bbcd5892@default(draft) addb
|/
@@ -204,14 +204,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 Jan 15 21:45:46 2018 +0100
+++ b/tests/test-stabilize-result.t Mon Jan 15 21:47:40 2018 +0100
@@ -217,7 +217,6 @@
$ echo 'babar' >> a
$ hg amend
$ hg up --hidden 3932c176bbaa
- updating to a hidden changeset 3932c176bbaa
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)
@@ -230,7 +229,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:8c986e77913c@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
| |
@@ -326,7 +325,6 @@
-------------------------------------------------
$ hg up --hidden 3932c176bbaa
- updating to a hidden changeset 3932c176bbaa
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: f344982e63c4)
--- a/tests/test-stack-branch.t Mon Jan 15 21:45:46 2018 +0100
+++ b/tests/test-stack-branch.t Mon Jan 15 21:47:40 2018 +0100
@@ -112,9 +112,9 @@
$ 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
|/
@@ -235,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
|/
@@ -269,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 Jan 15 21:45:46 2018 +0100
+++ b/tests/test-topic-change.t Mon Jan 15 21:47:40 2018 +0100
@@ -158,16 +158,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}
@@ -377,7 +377,7 @@
@ 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 Jan 15 21:45:46 2018 +0100
+++ b/tests/test-topic-debugcb.t Mon Jan 15 21:47:40 2018 +0100
@@ -259,7 +259,7 @@
$ 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 Jan 15 21:45:46 2018 +0100
+++ b/tests/test-topic-stack-complex.t Mon Jan 15 21:47:40 2018 +0100
@@ -94,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
@@ -116,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 Jan 15 21:45:46 2018 +0100
+++ b/tests/test-topic-stack-data.t Mon Jan 15 21:47:40 2018 +0100
@@ -121,7 +121,7 @@
|
| o bar1_d (default) [bar]
| |
- | | * add bar_e (default) [bar]
+ | | o add bar_e (default) [bar]
| | |
| | x add bar_d (default) [bar]
| |/
@@ -133,9 +133,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 Jan 15 21:45:46 2018 +0100
+++ b/tests/test-topic-stack.t Mon Jan 15 21:47:40 2018 +0100
@@ -265,9 +265,9 @@
$ 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
|/
@@ -406,9 +406,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
|/
@@ -449,9 +449,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
|/
@@ -490,15 +490,15 @@
$ 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
|/
@@ -673,21 +673,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
|
@@ -743,25 +743,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
|
@@ -864,13 +864,13 @@
| rewritten(parent, content) as dde94df880e9, e7ea874afbd5 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x 907f7d3c2333 (18) c_G
- | rewritten(content) as b24bab30ac12 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten as b24bab30ac12 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x 3ab2eedae500 (13) c_G
- | rewritten(parent) as 907f7d3c2333 by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten as 907f7d3c2333 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x c7d60a180d05 (6) c_G
- rewritten(user) as 3ab2eedae500 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten as 3ab2eedae500 by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg export .
# HG changeset patch
--- a/tests/test-topic-tutorial.t Mon Jan 15 21:45:46 2018 +0100
+++ b/tests/test-topic-tutorial.t Mon Jan 15 21:47:40 2018 +0100
@@ -1223,14 +1223,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-touch.t Mon Jan 15 21:45:46 2018 +0100
+++ b/tests/test-touch.t Mon Jan 15 21:47:40 2018 +0100
@@ -32,7 +32,6 @@
$ hg add b
$ hg commit -m ab --amend
$ hg up --hidden 1
- updating to a hidden changeset [0-9a-f]{12} (re)
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)
@@ -49,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
@@ -113,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 Jan 15 21:45:46 2018 +0100
+++ b/tests/test-tutorial.t Mon Jan 15 21:47:40 2018 +0100
@@ -1222,7 +1222,7 @@
see both version showing up in the log.
$ hg log -G
- * bf1b0d202029 (draft): animals
+ o bf1b0d202029 (draft): animals
|
| @ a44c85f957d3 (draft): bathroom stuff
| |
@@ -1685,7 +1685,7 @@
is neither dead or obsolete. My repository is in an unstable state again.
$ hg log -G
- * 99f039c5ec9e (draft): SPAM SPAM SPAM
+ o 99f039c5ec9e (draft): SPAM SPAM SPAM
|
x ee942144f952 (draft): animals
|
--- a/tests/test-uncommit.t Mon Jan 15 21:45:46 2018 +0100
+++ b/tests/test-uncommit.t Mon Jan 15 21:47:40 2018 +0100
@@ -238,7 +238,6 @@
Test phase is preserved, no local changes
$ hg up -C 3 --hidden
- updating to a hidden changeset 5eb72dbe0cb4
8 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark touncommit-bm)
working directory parent is obsolete! (5eb72dbe0cb4)
@@ -269,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
|/
@@ -286,7 +285,6 @@
Test --all
$ hg up -C 3 --hidden
- updating to a hidden changeset 5eb72dbe0cb4
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 Jan 15 21:45:46 2018 +0100
+++ b/tests/test-unstable.t Mon Jan 15 21:47:40 2018 +0100
@@ -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
|/
@@ -90,7 +90,7 @@
$ hg log -G
@ 4:47127ea62e5f@default(draft) aprime
|
- | * 3:6b4280e33286@default(draft) merge
+ | o 3:6b4280e33286@default(draft) merge
| |\
+---o 2:474da87dd33b@default(draft) add _c
| |
@@ -143,7 +143,7 @@
|
| o 4:47127ea62e5f@default(draft) aprime
|/
- | * 3:6b4280e33286@default(draft) merge
+ | o 3:6b4280e33286@default(draft) merge
| |\
+---x 2:474da87dd33b@default(draft) add _c
| |
@@ -160,7 +160,7 @@
|
| o 4:47127ea62e5f@default(draft) aprime
|/
- | * 3:6b4280e33286@default(draft) merge
+ | o 3:6b4280e33286@default(draft) merge
| |\
+---x 2:474da87dd33b@default(draft) add _c
| |
@@ -191,7 +191,7 @@
|
o 3:8b87864bd0f4@default(draft) add bprimesplit1
|
- | * 2:102002290587@default(draft) add _c
+ | o 2:102002290587@default(draft) add _c
| |
| x 1:37445b16603b@default(draft) add _b
|/
@@ -245,7 +245,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
|/
@@ -294,7 +294,7 @@
|
| o 3:8b87864bd0f4@default(draft) add bprimesplit1
|/
- | * 2:102002290587@default(draft) add _c
+ | o 2:102002290587@default(draft) add _c
| |
| x 1:37445b16603b@default(draft) add _b
|/
@@ -308,7 +308,7 @@
|
| o 3:8b87864bd0f4@default(draft) add bprimesplit1
|/
- | * 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 Jan 15 21:45:46 2018 +0100
+++ b/tests/test-userguide.t Mon Jan 15 21:47:40 2018 +0100
@@ -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 Jan 15 21:45:46 2018 +0100
+++ b/tests/test-wireproto.t Mon Jan 15 21:47:40 2018 +0100
@@ -195,7 +195,7 @@
$ cat hg.pid >> $DAEMON_PIDS
$ curl -s http://localhost:$HGPORT/?cmd=capabilities
- _evoext_getbundle_obscommon 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=zstd,zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol)
+ _evoext_getbundle_obscommon 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=zstd,zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol)
Check we cannot use pushkey for marker exchange anymore