Mercurial > evolve
changeset 3382:f14ad1e83896 mercurial-4.1
test-compat: merge mercurial-4.2 into mercurial-4.1
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 16 Dec 2017 23:40:42 +0100 |
| parents | bd99cb54712b (diff) 16b4f0e32d9d (current diff) |
| children | b21a3753255f |
| files | |
| diffstat | 15 files changed, 163 insertions(+), 453 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-discovery-obshashrange.t Sat Dec 16 23:40:40 2017 +0100 +++ b/tests/test-discovery-obshashrange.t Sat Dec 16 23:40:42 2017 +0100 @@ -102,7 +102,7 @@ * @0000000000000000000000000000000000000000 (*)> debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 (glob) * @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob) * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob) - * @0000000000000000000000000000000000000000 (*)> debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 --config 'experimental.obshashrange.max-revs=1' exited 0 after *.?? seconds (glob) + * @0000000000000000000000000000000000000000 (*)> debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 --config experimental.obshashrange.max-revs=1 exited 0 after *.?? seconds (glob) * @0000000000000000000000000000000000000000 (*)> debugobsolete cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d (glob) * @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob) * @0000000000000000000000000000000000000000 (*)> obshashcache reset - new markers affect cached ranges (glob) @@ -114,7 +114,7 @@ * @0000000000000000000000000000000000000000 (*)> debugobsolete dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 (glob) * @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob) * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob) - * @0000000000000000000000000000000000000000 (*)> debugobsolete dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 --config 'experimental.obshashrange.warm-cache=0' exited 0 after *.?? seconds (glob) + * @0000000000000000000000000000000000000000 (*)> debugobsolete dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 --config experimental.obshashrange.warm-cache=0 exited 0 after *.?? seconds (glob) * @0000000000000000000000000000000000000000 (*)> debugobsolete eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 4de32a90b66cd083ebf3c00b41277aa7abca51dd (glob) * @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob) * @0000000000000000000000000000000000000000 (*)> obshashcache reset - new markers affect cached ranges (glob) @@ -203,7 +203,7 @@ $ hg debugobsolete ffffffffffffffffffffffffffffffffffffffff `getid '.'` $ hg push -f --debug pushing to ssh://user@dummy/server - running python "*/dummyssh" 'user@dummy' 'hg -R server serve --stdio' (glob) + running python "*/dummyssh" user@dummy 'hg -R server serve --stdio' (glob) sending hello command sending between command remote: 466 @@ -400,10 +400,10 @@ (run 'hg heads' to see heads, 'hg merge' to merge) $ hg -R ../server blackbox - * @0000000000000000000000000000000000000000 (*)> debugobsolete --rev '::tip' (glob) + * @0000000000000000000000000000000000000000 (*)> debugobsolete --rev ::tip (glob) * @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob) * @0000000000000000000000000000000000000000 (*)> writing .hg/cache/tags2-visible with 0 tags (glob) - * @0000000000000000000000000000000000000000 (*)> -R ../server/ debugobsolete --rev '::tip' exited 0 after *.?? seconds (glob) + * @0000000000000000000000000000000000000000 (*)> -R ../server/ debugobsolete --rev ::tip exited 0 after *.?? seconds (glob) * @0000000000000000000000000000000000000000 (*)> debugobsolete aaaaaaa11111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd (glob) * @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob) * @0000000000000000000000000000000000000000 (*)> obshashcache reset - new markers affect cached ranges (glob) @@ -510,20 +510,20 @@ 3 2dc09a01254d 3 1 4 26f996446ecb 1 66f7d451a68b 1 1 2 327c7dd73d29 $ hg blackbox - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete --rev '::6' (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete --rev ::6 (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> writing .hg/cache/tags2-visible with 0 tags (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete --rev '::6' exited 0 after *.?? seconds (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' exited 0 after *.?? seconds (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete --rev ::6 exited 0 after *.?? seconds (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev heads(all()) (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev heads(all()) exited 0 after *.?? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull -r f69452c5b1af6cbaaa56ef50cf94fff5bcc6ca23 (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 2/7 mismatch - 1 obshashrange queries in *.???? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obshashcache reset - new markers affect cached ranges (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obshashrange in *.???? seconds (0r, 2o) (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (0r, 2o) (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull -r f69452c5b1af6cbaaa56ef50cf94fff5bcc6ca23 exited 0 after *.?? seconds (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'desc("r3")' (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'desc("r3")' exited 0 after *.?? seconds (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev desc("r3") (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev desc("r3") exited 0 after *.?? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> blackbox (glob) $ rm .hg/blackbox.log @@ -580,8 +580,8 @@ $ hg rollback repository tip rolled back to revision 7 (undo pull) $ hg blackbox - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' exited 0 after *.?? seconds (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev heads(all()) (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev heads(all()) exited 0 after *.?? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 0/8 mismatch - 1 obshashrange queries in *.???? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (1r, 0o) (glob) @@ -628,13 +628,13 @@ 1 new obsolescence markers (run 'hg update' to get a working copy) $ hg blackbox - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev heads(all()) (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-depthcache cache reset (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-depthcache in *.???? seconds (8r) (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated stablerange cache in *.???? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-obshashrange cache reset (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obshashrange in *.???? seconds (8r, 12o) (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' exited 0 after *.?? seconds (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev heads(all()) exited 0 after *.?? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 0/8 mismatch - 1 obshashrange queries in *.???? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-obscache cache reset (glob) @@ -741,12 +741,12 @@ o 0 1ea73414a91b r0 $ hg blackbox - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev heads(all()) (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> writing .hg/cache/tags2-visible with 0 tags (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' exited 0 after *.?? seconds (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev heads(all()) exited 0 after *.?? seconds (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> log -G (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> log -G exited 0 after *.?? seconds (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip -r 'desc("foo")' (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip -r desc("foo") (glob) * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> saved backup bundle to $TESTTMP/client/.hg/strip-backup/45f8b879de92-94c82517-backup.hg (glob) * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> strip detected, evo-ext-obshashrange cache reset (glob) * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> strip detected, evo-ext-depthcache cache reset (glob) @@ -761,7 +761,7 @@ * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated base branch cache in *.???? seconds (glob) * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> wrote base branch cache with 1 labels and 1 nodes (glob) * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> 3 incoming changes - new heads: 4de32a90b66c (glob) - * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> --config 'extensions.strip=' strip -r 'desc("foo")' exited 0 after *.?? seconds (glob) + * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> --config extensions.strip= strip -r desc("foo") exited 0 after *.?? seconds (glob) * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> log -G (glob) * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> writing .hg/cache/tags2-visible with 0 tags (glob) * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> log -G exited 0 after *.?? seconds (glob)
--- a/tests/test-evolve-obshistory.t Sat Dec 16 23:40:40 2017 +0100 +++ b/tests/test-evolve-obshistory.t Sat Dec 16 23:40:42 2017 +0100 @@ -12,6 +12,7 @@ > publish=False > [extensions] > evolve = + > color = > [experimental] > evolution.effect-flags = yes > EOF @@ -179,7 +180,7 @@ ] $ hg update 471f378eab4c abort: hidden revision '471f378eab4c'! - (use --hidden to access hidden revisions; successor: 4ae3a4151de9) + (use --hidden to access hidden revisions) [255] $ hg update --hidden "desc(A0)" 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -278,7 +279,7 @@ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg up 0dec01379d3b abort: hidden revision '0dec01379d3b'! - (use --hidden to access hidden revisions; pruned) + (use --hidden to access hidden revisions) [255] $ hg up --hidden -r 'desc(B0)' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -474,7 +475,7 @@ $ hg update 471597cad322 abort: hidden revision '471597cad322'! - (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) + (use --hidden to access hidden revisions) [255] $ hg update --hidden 'min(desc(A0))' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -750,7 +751,7 @@ $ hg update de7290d8b885 abort: hidden revision 'de7290d8b885'! - (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) + (use --hidden to access hidden revisions) [255] $ hg update --hidden 'min(desc(A0))' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -965,7 +966,7 @@ ] $ hg update 471f378eab4c abort: hidden revision '471f378eab4c'! - (use --hidden to access hidden revisions; successor: eb5a0daa2192) + (use --hidden to access hidden revisions) [255] $ hg update --hidden 'desc(A0)' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -975,7 +976,7 @@ working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: eb5a0daa2192) abort: hidden revision '0dec01379d3b'! - (use --hidden to access hidden revisions; successor: eb5a0daa2192) + (use --hidden to access hidden revisions) [255] $ hg update --hidden 'desc(B0)' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -1287,7 +1288,7 @@ ] $ hg update 471f378eab4c abort: hidden revision '471f378eab4c'! - (use --hidden to access hidden revisions; diverged) + (use --hidden to access hidden revisions) [255] $ hg update --hidden 'desc(A0)' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -1505,7 +1506,7 @@ ] $ hg update 471f378eab4c abort: hidden revision '471f378eab4c'! - (use --hidden to access hidden revisions; successor: eb5a0daa2192) + (use --hidden to access hidden revisions) [255] $ hg update --hidden 'desc(A0)' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-evolve-serveronly-bundle2.t Sat Dec 16 23:40:40 2017 +0100 +++ b/tests/test-evolve-serveronly-bundle2.t Sat Dec 16 23:40:42 2017 +0100 @@ -127,7 +127,7 @@ adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 2 new obsolescence markers - (run 'hg heads' to see heads) + (run 'hg heads' to see heads, 'hg merge' to merge) $ cat ../errors.log $ hg -R ../other pull pulling from http://localhost:$HGPORT/
--- a/tests/test-evolve-templates.t Sat Dec 16 23:40:40 2017 +0100 +++ b/tests/test-evolve-templates.t Sat Dec 16 23:40:42 2017 +0100 @@ -16,10 +16,7 @@ > {if(precursors, "\n Precursors: {precursors}")}\ > {if(precursors, "\n semi-colon: {join(precursors, "; ")}")}\ > {if(successors, "\n Successors: {successors}")}\ - > {if(successors, "\n semi-colon: {join(successors, "; ")}")}\ - > {if(obsfate, "\n Fate: {join(obsfate, "\n Fate: ")}\n")}\n' - > fatelog = log -G -T '{node|short}\n{if(obsfate, " Obsfate: {join(obsfate, "; ")}\n\n")}' - > fatelogjson = log -G -T '{node|short} {obsfate|json}\n' + > {if(successors, "\n semi-colon: {join(successors, "; ")}")}\n' > EOF Test templates on amended commit @@ -88,74 +85,8 @@ | @ 471f378eab4c |/ Successors: [d004c8f274b9] | semi-colon: [d004c8f274b9] - | Fate: rewritten as d004c8f274b9 by test, test2 - | - o ea207398892e - - - $ hg log -G - o changeset: 4:d004c8f274b9 - | tag: tip - | parent: 0:ea207398892e - | user: test - | date: Thu Jan 01 00:00:00 1970 +0000 - | summary: A2 - | - | @ changeset: 1:471f378eab4c - |/ user: test - | date: Thu Jan 01 00:00:00 1970 +0000 - | summary: A0 - | - o changeset: 0:ea207398892e - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: ROOT - - - $ hg fatelog -q - o d004c8f274b9 - | - | @ 471f378eab4c - |/ Obsfate: rewritten as d004c8f274b9 - | o ea207398892e - - $ hg fatelog - o d004c8f274b9 - | - | @ 471f378eab4c - |/ Obsfate: rewritten as d004c8f274b9 by test, test2 - | - o ea207398892e - - $ hg fatelog -v - o d004c8f274b9 - | - | @ 471f378eab4c - |/ Obsfate: rewritten as d004c8f274b9 by test, test2 (*) (glob) - | - o ea207398892e - - -(check json) - - $ hg log -GT '{precursors|json}\n' - o ["471f378eab4c5e25f6c77f785b27c936efb22874"] - | - | @ [] - |/ - o [] - - - $ hg log -GT '{successors|json}\n' - o "" - | - | @ [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]] - |/ - o "" - - $ hg up 'desc(A1)' --hidden 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory parent is obsolete! (a468dc9b3633) @@ -169,8 +100,6 @@ | @ a468dc9b3633 |/ Successors: [d004c8f274b9] | semi-colon: [d004c8f274b9] - | Fate: reworded as d004c8f274b9 by test2 - | o ea207398892e Precursors template should show the precursor as we force its display with @@ -184,24 +113,11 @@ | semi-colon: 471f378eab4c | Successors: [d004c8f274b9] | semi-colon: [d004c8f274b9] - | Fate: reworded as d004c8f274b9 by test2 - | | x f137d23bb3e1 - | | Fate: pruned | | | x 471f378eab4c |/ Successors: [a468dc9b3633] | semi-colon: [a468dc9b3633] - | Fate: rewritten as a468dc9b3633 - | - o ea207398892e - - $ hg fatelog -v - o d004c8f274b9 - | - | @ a468dc9b3633 - |/ Obsfate: reworded as d004c8f274b9 by test2 (*) (glob) - | o ea207398892e $ hg up 'desc(A2)' @@ -220,50 +136,13 @@ | semi-colon: 471f378eab4c | Successors: [d004c8f274b9] | semi-colon: [d004c8f274b9] - | Fate: reworded as d004c8f274b9 by test2 - | | x f137d23bb3e1 - | | Fate: pruned | | | x 471f378eab4c |/ Successors: [a468dc9b3633] | semi-colon: [a468dc9b3633] - | Fate: rewritten as a468dc9b3633 - | o ea207398892e - $ hg fatelog -v - @ d004c8f274b9 - | - o ea207398892e - - - $ hg fatelog -v --hidden - @ d004c8f274b9 - | - | x a468dc9b3633 - |/ Obsfate: reworded as d004c8f274b9 by test2 (*) (glob) - | - | x f137d23bb3e1 - | | Obsfate: pruned by test (at *) (glob) - | | - | x 471f378eab4c - |/ Obsfate: rewritten as a468dc9b3633 by test (*) (glob) - | - o ea207398892e - - - $ hg fatelogjson --hidden - @ d004c8f274b9 [] - | - | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}] (glob) - |/ - | x f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test"]], [*, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [*, 0], "min_date": [*, 0], "successors": [], "users": ["test"], "verb": "pruned"}] (glob) - | | - | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}] (glob) - |/ - o ea207398892e [] - Test templates with splitted commit =================================== @@ -366,18 +245,6 @@ | @ 471597cad322 |/ Successors: [337fec4d2edc, f257fde29c7a] | semi-colon: [337fec4d2edc, f257fde29c7a] - | Fate: split as 337fec4d2edc, f257fde29c7a - | - o ea207398892e - - $ hg fatelog - o f257fde29c7a - | - o 337fec4d2edc - | - | @ 471597cad322 - |/ Obsfate: split as 337fec4d2edc, f257fde29c7a - | o ea207398892e @@ -405,31 +272,8 @@ | x 471597cad322 |/ Successors: [337fec4d2edc, f257fde29c7a] | semi-colon: [337fec4d2edc, f257fde29c7a] - | Fate: split as 337fec4d2edc, f257fde29c7a - | o ea207398892e - $ hg fatelog --hidden - @ f257fde29c7a - | - o 337fec4d2edc - | - | x 471597cad322 - |/ Obsfate: split as 337fec4d2edc, f257fde29c7a - | - o ea207398892e - - - $ hg fatelogjson --hidden - @ f257fde29c7a [] - | - o 337fec4d2edc [] - | - | x 471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}] (glob) - |/ - o ea207398892e [] - - Test templates with folded commit ============================== @@ -500,16 +344,6 @@ | @ 471f378eab4c |/ Successors: [eb5a0daa2192] | semi-colon: [eb5a0daa2192] - | Fate: rewritten as eb5a0daa2192 - | - o ea207398892e - - $ hg fatelog - o eb5a0daa2192 - | - | @ 471f378eab4c - |/ Obsfate: rewritten as eb5a0daa2192 - | o ea207398892e $ hg up 'desc(B0)' --hidden @@ -526,27 +360,11 @@ | @ 0dec01379d3b | | Successors: [eb5a0daa2192] | | semi-colon: [eb5a0daa2192] - | | Fate: rewritten as eb5a0daa2192 - | | | x 471f378eab4c |/ Successors: [eb5a0daa2192] | semi-colon: [eb5a0daa2192] - | Fate: rewritten as eb5a0daa2192 - | o ea207398892e - $ hg fatelog - o eb5a0daa2192 - | - | @ 0dec01379d3b - | | Obsfate: rewritten as eb5a0daa2192 - | | - | x 471f378eab4c - |/ Obsfate: rewritten as eb5a0daa2192 - | - o ea207398892e - - $ hg up 'desc(C0)' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -566,36 +384,11 @@ | x 0dec01379d3b | | Successors: [eb5a0daa2192] | | semi-colon: [eb5a0daa2192] - | | Fate: rewritten as eb5a0daa2192 - | | | x 471f378eab4c |/ Successors: [eb5a0daa2192] | semi-colon: [eb5a0daa2192] - | Fate: rewritten as eb5a0daa2192 - | o ea207398892e - $ hg fatelog --hidden - @ eb5a0daa2192 - | - | x 0dec01379d3b - | | Obsfate: rewritten as eb5a0daa2192 - | | - | x 471f378eab4c - |/ Obsfate: rewritten as eb5a0daa2192 - | - o ea207398892e - - - $ hg fatelogjson --hidden - @ eb5a0daa2192 [] - | - | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob) - | | - | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob) - |/ - o ea207398892e [] - Test templates with divergence ============================== @@ -679,22 +472,8 @@ | @ 471f378eab4c |/ Successors: [fdf9bde5129a], [019fadeab383] | semi-colon: [fdf9bde5129a]; [019fadeab383] - | Fate: reworded as fdf9bde5129a - | Fate: reworded as 019fadeab383 - | o ea207398892e - $ hg fatelog - o 019fadeab383 - | - | o fdf9bde5129a - |/ - | @ 471f378eab4c - |/ Obsfate: reworded as fdf9bde5129a; reworded as 019fadeab383 - | - o ea207398892e - - $ hg up 'desc(A1)' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved Precursors template should not show precursors as it's not displayed in the @@ -707,13 +486,6 @@ o ea207398892e - $ hg fatelog - o 019fadeab383 - | - | @ fdf9bde5129a - |/ - o ea207398892e - Precursors template should a precursor as we force its display with --hidden $ hg tlog --hidden o 019fadeab383 @@ -724,44 +496,14 @@ | semi-colon: 471f378eab4c | Successors: [019fadeab383] | semi-colon: [019fadeab383] - | Fate: reworded as 019fadeab383 - | | @ fdf9bde5129a |/ Precursors: 471f378eab4c | semi-colon: 471f378eab4c | x 471f378eab4c |/ Successors: [fdf9bde5129a], [65b757b745b9] | semi-colon: [fdf9bde5129a]; [65b757b745b9] - | Fate: reworded as fdf9bde5129a - | Fate: reworded as 65b757b745b9 - | o ea207398892e - $ hg fatelog --hidden - o 019fadeab383 - | - | x 65b757b745b9 - |/ Obsfate: reworded as 019fadeab383 - | - | @ fdf9bde5129a - |/ - | x 471f378eab4c - |/ Obsfate: reworded as fdf9bde5129a; reworded as 65b757b745b9 - | - o ea207398892e - - - $ hg fatelogjson --hidden - o 019fadeab383 [] - | - | x 65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}] (glob) - |/ - | @ fdf9bde5129a [] - |/ - | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}] (glob) - |/ - o ea207398892e [] - Test templates with amended + folded commit =========================================== @@ -844,16 +586,6 @@ | @ 471f378eab4c |/ Successors: [eb5a0daa2192] | semi-colon: [eb5a0daa2192] - | Fate: rewritten as eb5a0daa2192 - | - o ea207398892e - - $ hg fatelog - o eb5a0daa2192 - | - | @ 471f378eab4c - |/ Obsfate: rewritten as eb5a0daa2192 - | o ea207398892e $ hg up 'desc(B0)' --hidden @@ -867,24 +599,9 @@ | @ 0dec01379d3b | | Successors: [eb5a0daa2192] | | semi-colon: [eb5a0daa2192] - | | Fate: rewritten as eb5a0daa2192 - | | | x 471f378eab4c |/ Successors: [eb5a0daa2192] | semi-colon: [eb5a0daa2192] - | Fate: rewritten as eb5a0daa2192 - | - o ea207398892e - - $ hg fatelog - o eb5a0daa2192 - | - | @ 0dec01379d3b - | | Obsfate: rewritten as eb5a0daa2192 - | | - | x 471f378eab4c - |/ Obsfate: rewritten as eb5a0daa2192 - | o ea207398892e @@ -899,24 +616,9 @@ | @ b7ea6d14e664 | | Successors: [eb5a0daa2192] | | semi-colon: [eb5a0daa2192] - | | Fate: rewritten as eb5a0daa2192 - | | | x 471f378eab4c |/ Successors: [eb5a0daa2192] | semi-colon: [eb5a0daa2192] - | Fate: rewritten as eb5a0daa2192 - | - o ea207398892e - - $ hg fatelog - o eb5a0daa2192 - | - | @ b7ea6d14e664 - | | Obsfate: rewritten as eb5a0daa2192 - | | - | x 471f378eab4c - |/ Obsfate: rewritten as eb5a0daa2192 - | o ea207398892e @@ -936,46 +638,14 @@ | | semi-colon: 0dec01379d3b | | Successors: [eb5a0daa2192] | | semi-colon: [eb5a0daa2192] - | | Fate: rewritten as eb5a0daa2192 - | | | | x 0dec01379d3b | |/ Successors: [b7ea6d14e664] | | semi-colon: [b7ea6d14e664] - | | Fate: reworded as b7ea6d14e664 - | | | x 471f378eab4c |/ Successors: [eb5a0daa2192] | semi-colon: [eb5a0daa2192] - | Fate: rewritten as eb5a0daa2192 - | o ea207398892e - $ hg fatelog --hidden - @ eb5a0daa2192 - | - | x b7ea6d14e664 - | | Obsfate: rewritten as eb5a0daa2192 - | | - | | x 0dec01379d3b - | |/ Obsfate: reworded as b7ea6d14e664 - | | - | x 471f378eab4c - |/ Obsfate: rewritten as eb5a0daa2192 - | - o ea207398892e - - $ hg fatelogjson --hidden - @ eb5a0daa2192 [] - | - | x b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob) - | | - | | x 0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}] (glob) - | |/ - | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob) - |/ - o ea207398892e [] - - Test template with pushed and pulled obs markers ============================================== @@ -1069,58 +739,8 @@ | @ 471f378eab4c |/ Successors: [7a230b46bf61] | semi-colon: [7a230b46bf61] - | Fate: reworded as 7a230b46bf61 - | - o ea207398892e - - $ hg fatelog --hidden -v - o 7a230b46bf61 - | - | @ 471f378eab4c - |/ Obsfate: reworded as 7a230b46bf61 by test (*) (glob) - | - o ea207398892e - - $ hg up 'desc(A2)' - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg tlog - @ 7a230b46bf61 - | - o ea207398892e - - $ hg fatelog -v - @ 7a230b46bf61 - | o ea207398892e - $ hg tlog --hidden - @ 7a230b46bf61 - | Precursors: 471f378eab4c - | semi-colon: 471f378eab4c - | x 471f378eab4c - |/ Successors: [7a230b46bf61] - | semi-colon: [7a230b46bf61] - | Fate: reworded as 7a230b46bf61 - | - o ea207398892e - - $ hg fatelog --hidden -v - @ 7a230b46bf61 - | - | x 471f378eab4c - |/ Obsfate: reworded as 7a230b46bf61 by test (*) (glob) - | - o ea207398892e - - - $ hg fatelogjson --hidden - @ 7a230b46bf61 [] - | - | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}] (glob) - |/ - o ea207398892e [] - - Test templates with pruned commits ================================== @@ -1145,13 +765,6 @@ (use 'hg evolve' to update to its parent successor) $ hg tlog @ 471f378eab4c - | Fate: pruned | o ea207398892e - $ hg fatelog -v - @ 471f378eab4c - | Obsfate: pruned by test (at *) (glob) - | - o ea207398892e -
--- a/tests/test-evolve.t Sat Dec 16 23:40:40 2017 +0100 +++ b/tests/test-evolve.t Sat Dec 16 23:40:42 2017 +0100 @@ -92,8 +92,9 @@ Orphans are changesets left behind when their ancestors are rewritten, (currently: 'unstable'). Divergence has two variants: - * Content-divergence occurs when independent rewrites of the same - changesets lead to different results. (currently: 'divergent') + * Content-divergence occurs when independent rewrites of the same changesets + lead to different results. (currently: 'divergent') + * Phase-divergence occurs when the old (obsolete) version of a changeset becomes public. (currently: 'bumped')
--- a/tests/test-fold.t Sat Dec 16 23:40:40 2017 +0100 +++ b/tests/test-fold.t Sat Dec 16 23:40:42 2017 +0100 @@ -91,7 +91,7 @@ $ hg fold --from 6 # want to run hg fold 6 abort: hidden revision '6'! - (use --hidden to access hidden revisions; successor: 198b5c405d01) + (use --hidden to access hidden revisions) [255] $ hg log -G
--- a/tests/test-obsolete.t Sat Dec 16 23:40:40 2017 +0100 +++ b/tests/test-obsolete.t Sat Dec 16 23:40:42 2017 +0100 @@ -10,6 +10,7 @@ > debugobsolete=debugobsolete -d '0 0' > [extensions] > hgext.rebase= + > color = > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ mkcommit() { @@ -274,7 +275,7 @@ adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers - (run 'hg heads' to see heads, 'hg merge' to merge) + (run 'hg heads .' to see heads, 'hg merge' to merge) $ qlog -R ../other-new 6 - 909a0fb57e5d @@ -364,7 +365,7 @@ adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers - (run 'hg heads' to see heads, 'hg merge' to merge) + (run 'hg heads .' to see heads, 'hg merge' to merge) $ hg up -q 7 # to check rollback update behavior $ qlog
--- a/tests/test-prev-next.t Sat Dec 16 23:40:40 2017 +0100 +++ b/tests/test-prev-next.t Sat Dec 16 23:40:42 2017 +0100 @@ -1,5 +1,6 @@ $ cat >> $HGRCPATH <<EOF > [extensions] + > color = > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
--- a/tests/test-prune.t Sat Dec 16 23:40:40 2017 +0100 +++ b/tests/test-prune.t Sat Dec 16 23:40:42 2017 +0100 @@ -2,6 +2,7 @@ > [ui] > logtemplate={rev}:{node|short}[{bookmarks}] ({separate('/', obsolete ,phase)}) {desc|firstline}\n > [extensions] + > color = > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH @@ -307,7 +308,7 @@ 1 changesets pruned $ hg id -ir dcbb326fdec2 abort: hidden revision 'dcbb326fdec2'! - (use --hidden to access hidden revisions; pruned) + (use --hidden to access hidden revisions) [255] $ hg id -ir d62d843c9a01 d62d843c9a01 @@ -341,7 +342,7 @@ $ hg tag --remove --local c $ hg id -ir 6:2702dd0c91e7 abort: hidden revision '6'! - (use --hidden to access hidden revisions; pruned) + (use --hidden to access hidden revisions) [255] $ hg debugobsstorestat
--- a/tests/test-topic-stack-complex.t Sat Dec 16 23:40:40 2017 +0100 +++ b/tests/test-topic-stack-complex.t Sat Dec 16 23:40:42 2017 +0100 @@ -12,7 +12,6 @@ > [defaults] > split = -d "0 "0 > [extensions] - > show = > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH @@ -33,11 +32,31 @@ $ echo e > e $ echo f > f $ hg ci -Aqm "Added e and f" - $ hg show work - @ f1d36 Added e and f - o 8e825 Added c and d - o 002b8 Added a and b - o f3603 Added foo + $ hg log -G + @ changeset: 3:f1d3649d6a8b + | tag: tip + | topic: foo + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: Added e and f + | + o changeset: 2:8e8251e8193b + | topic: foo + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: Added c and d + | + o changeset: 1:002b85930b9c + | topic: foo + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: Added a and b + | + o changeset: 0:f3603c09ac10 + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: Added foo + Testing in case of split within the topic @@ -93,14 +112,45 @@ t1: Added a and b t0^ Added foo (base) - $ hg show work - @ 5ccee split2 - o f26c1 split1 - | o f1d36 Added e and f - | x 8e825 Added c and d - |/ - o 002b8 Added a and b - o f3603 Added foo + $ hg log -G + @ changeset: 5:5ccee6da565e + | tag: tip + | topic: foo + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: split2 + | + o changeset: 4:f26c1b9addde + | topic: foo + | parent: 1:002b85930b9c + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: split1 + | + | o changeset: 3:f1d3649d6a8b + | | topic: foo + | | user: test + | | date: Thu Jan 01 00:00:00 1970 +0000 + | | trouble: unstable + | | summary: Added e and f + | | + | x changeset: 2:8e8251e8193b + |/ topic: foo + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: Added c and d + | + o changeset: 1:002b85930b9c + | topic: foo + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: Added a and b + | + o changeset: 0:f3603c09ac10 + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: Added foo + $ hg prev 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -116,16 +166,54 @@ $ hg amend 1 new unstable changesets - $ hg show work - @ 7d944 split1 - | o 5ccee split2 - | x f26c1 split1 - |/ - | o f1d36 Added e and f - | x 8e825 Added c and d - |/ - o 002b8 Added a and b - o f3603 Added foo + + $ hg log -G + @ changeset: 7:7d9445714d83 + | tag: tip + | topic: foo + | parent: 1:002b85930b9c + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: split1 + | + | o changeset: 5:5ccee6da565e + | | topic: foo + | | user: test + | | date: Thu Jan 01 00:00:00 1970 +0000 + | | trouble: unstable + | | summary: split2 + | | + | x changeset: 4:f26c1b9addde + |/ topic: foo + | parent: 1:002b85930b9c + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: split1 + | + | o changeset: 3:f1d3649d6a8b + | | topic: foo + | | user: test + | | date: Thu Jan 01 00:00:00 1970 +0000 + | | trouble: unstable + | | summary: Added e and f + | | + | x changeset: 2:8e8251e8193b + |/ topic: foo + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: Added c and d + | + o changeset: 1:002b85930b9c + | topic: foo + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: Added a and b + | + o changeset: 0:f3603c09ac10 + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: Added foo + $ hg stack ### topic: foo (2 heads)
--- a/tests/test-topic-stack.t Sat Dec 16 23:40:40 2017 +0100 +++ b/tests/test-topic-stack.t Sat Dec 16 23:40:42 2017 +0100 @@ -4,6 +4,8 @@ $ cat << EOF >> $HGRCPATH + > [extensions] + > color = > [ui] > logtemplate = {rev} {branch} \{{get(namespaces, "topics")}} {phase} {desc|firstline}\n > [experimental]
--- a/tests/test-topic-tutorial.t Sat Dec 16 23:40:40 2017 +0100 +++ b/tests/test-topic-tutorial.t Sat Dec 16 23:40:42 2017 +0100 @@ -1797,8 +1797,9 @@ $ cd client We can now share these draft changesets: +(4.1-tests needs the --force to proceed with the test) - $ hg push ../non-publishing-server -r tools + $ hg push ../non-publishing-server -r tools --force pushing to ../non-publishing-server searching for changes adding changesets @@ -1842,12 +1843,13 @@ t0^ add a pair of shoes (base) We can also add new changesets and share them: +(4.1-tests needs the --force to proceed with the test) $ echo screws >> shopping $ hg commit -A -m "Adding screws" - $ hg push ../non-publishing-server + $ hg push ../non-publishing-server --force pushing to ../non-publishing-server searching for changes adding changesets
--- a/tests/test-userguide.t Sat Dec 16 23:40:40 2017 +0100 +++ b/tests/test-userguide.t Sat Dec 16 23:40:42 2017 +0100 @@ -39,7 +39,7 @@ $ hg commit --amend -u alice -d '2 0' -m 'implement feature Y' $ hg shortlog -q -r fe0ecd3bd2a4 abort: hidden revision 'fe0ecd3bd2a4'! - (use --hidden to access hidden revisions; successor: 934359450037) + (use --hidden to access hidden revisions) [255] $ hg --hidden shortlog -G @ 3:934359450037 draft implement feature Y
--- a/tests/test-wireproto-bundle1.t Sat Dec 16 23:40:40 2017 +0100 +++ b/tests/test-wireproto-bundle1.t Sat Dec 16 23:40:42 2017 +0100 @@ -87,7 +87,7 @@ adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 2 new obsolescence markers - (run 'hg heads' to see heads) + (run 'hg heads' to see heads, 'hg merge' to merge) $ hg -R ../other pull pulling from ssh://user@dummy/server searching for changes
--- a/tests/test-wireproto.t Sat Dec 16 23:40:40 2017 +0100 +++ b/tests/test-wireproto.t Sat Dec 16 23:40:42 2017 +0100 @@ -92,7 +92,7 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) obsmarker-exchange: 151 bytes received 2 new obsolescence markers - (run 'hg heads' to see heads) + (run 'hg heads' to see heads, 'hg merge' to merge) $ hg -R ../other pull pulling from ssh://user@dummy/server searching for changes @@ -147,7 +147,7 @@ added 1 changesets with 0 changes to 1 files (+1 heads) obsmarker-exchange: 227 bytes received 1 new obsolescence markers - (run 'hg heads' to see heads) + (run 'hg heads' to see heads, 'hg merge' to merge) test discovery avoid exchanging known markers