Mercurial > evolve
changeset 3100:ccfcacc5ee7c mercurial-4.3
test-compat: revert output change on pull report
The revert the changeset from 8feb2cae7eae. Not relevant for verison < 4.4.
line wrap: on
line diff
--- a/tests/test-discovery-obshashrange.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-discovery-obshashrange.t Fri Oct 20 15:30:42 2017 +0200 @@ -137,7 +137,6 @@ adding file changes added 5 changesets with 0 changes to 0 files 3 new obsolescence markers - new changesets 1ea73414a91b:bebd167eb94d (run 'hg update' to get a working copy) $ hg -R ../server blackbox * @0000000000000000000000000000000000000000 (*)> debugobshashrange --subranges --rev tip (glob) @@ -372,7 +371,6 @@ adding file changes added 2 changesets with 0 changes to 0 files (+1 heads) 3 new obsolescence markers - new changesets c8d03c1b5e94:f69452c5b1af (run 'hg heads' to see heads, 'hg merge' to merge) $ hg -R ../server blackbox @@ -550,7 +548,6 @@ adding file changes added 1 changesets with 0 changes to 0 files 1 new obsolescence markers - new changesets 4de32a90b66c (run 'hg update' to get a working copy) $ hg rollback repository tip rolled back to revision 7 (undo pull) @@ -601,7 +598,6 @@ adding file changes added 1 changesets with 0 changes to 0 files 1 new obsolescence markers - new changesets 4de32a90b66c (run 'hg update' to get a working copy) $ hg blackbox * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' (glob) @@ -693,7 +689,6 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) 2 new obsolescence markers - new changesets 45f8b879de92 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg log -G o 8 45f8b879de92 foo tip
--- a/tests/test-evolve-bumped.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-evolve-bumped.t Fri Oct 20 15:30:42 2017 +0200 @@ -49,7 +49,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets 4d1169d82e47 (run 'hg update' to get a working copy) $ hg log -r 'draft()' 1:4d1169d82e47@default(draft) modify a
--- a/tests/test-evolve-obshistory.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-evolve-obshistory.t Fri Oct 20 15:30:42 2017 +0200 @@ -1624,7 +1624,6 @@ added 1 changesets with 0 changes to 1 files (+1 heads) 2 new obsolescence markers obsoleted 1 changesets - new changesets 7a230b46bf61 (run 'hg heads' to see heads, 'hg merge' to merge) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: 7a230b46bf61)
--- a/tests/test-evolve-serveronly-bundle2.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-evolve-serveronly-bundle2.t Fri Oct 20 15:30:42 2017 +0200 @@ -72,7 +72,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files - new changesets 8685c6d34325:4957bfdac07e (run 'hg update' to get a working copy) $ cat ../errors.log $ hg push -R ../other @@ -130,7 +129,6 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers obsoleted 1 changesets - new changesets 9d1c114e7797 (run 'hg heads' to see heads) $ cat ../errors.log $ hg -R ../other pull
--- a/tests/test-evolve-serveronly.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-evolve-serveronly.t Fri Oct 20 15:30:42 2017 +0200 @@ -76,7 +76,6 @@ the remote repository use years old versions of Mercurial and evolve pulling obsmarker using legacy method (please upgrade your server) - new changesets 8685c6d34325:4957bfdac07e (run 'hg update' to get a working copy) $ cat ../errors.log $ hg push -R ../other @@ -142,7 +141,6 @@ (please upgrade your server) 1 obsolescence markers added obsoleted 1 changesets - new changesets 9d1c114e7797 (run 'hg heads' to see heads) $ cat ../errors.log $ hg -R ../other pull
--- a/tests/test-evolve.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-evolve.t Fri Oct 20 15:30:42 2017 +0200 @@ -508,7 +508,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets 702e4d0a6d86 $ cd alpha $ cat << EOF > A @@ -567,7 +566,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets c6dda801837c (run 'hg update' to get a working copy) $ hg up 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-exchange-obsmarkers-case-A1.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-A1.t Fri Oct 20 15:30:42 2017 +0200 @@ -113,7 +113,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets f5bc6836db60 (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -155,7 +154,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets f5bc6836db60 (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -269,7 +267,6 @@ adding file changes added 2 changesets with 2 changes to 2 files 1 new obsolescence markers - new changesets f5bc6836db60:f6fbb35d8ac9 (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -311,7 +308,6 @@ adding file changes added 2 changesets with 2 changes to 2 files 1 new obsolescence markers - new changesets f5bc6836db60:f6fbb35d8ac9 (run 'hg update' to get a working copy) ## post pull state # obstore: main
--- a/tests/test-exchange-obsmarkers-case-A2.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-A2.t Fri Oct 20 15:30:42 2017 +0200 @@ -124,7 +124,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets f5bc6836db60 (run 'hg update' to get a working copy) ## post pull state # obstore: main
--- a/tests/test-exchange-obsmarkers-case-A3.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-A3.t Fri Oct 20 15:30:42 2017 +0200 @@ -145,7 +145,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets e5ea8f9c7314 (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -264,7 +263,6 @@ added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers obsoleted 1 changesets - new changesets e5ea8f9c7314 (run 'hg heads' to see heads, 'hg merge' to merge) 1 new orphan changesets ## post pull state
--- a/tests/test-exchange-obsmarkers-case-A4.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-A4.t Fri Oct 20 15:30:42 2017 +0200 @@ -133,7 +133,6 @@ adding file changes added 2 changesets with 2 changes to 2 files 1 new obsolescence markers - new changesets 28b51eb45704:06055a7959d4 (run 'hg update' to get a working copy) ## post pull state # obstore: main
--- a/tests/test-exchange-obsmarkers-case-A5.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-A5.t Fri Oct 20 15:30:42 2017 +0200 @@ -141,7 +141,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets f6298a8ac3a4 (run 'hg update' to get a working copy) ## post pull state # obstore: main
--- a/tests/test-exchange-obsmarkers-case-B3.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-B3.t Fri Oct 20 15:30:42 2017 +0200 @@ -120,7 +120,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets f5bc6836db60 (run 'hg update' to get a working copy) ## post pull state # obstore: main
--- a/tests/test-exchange-obsmarkers-case-B5.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-B5.t Fri Oct 20 15:30:42 2017 +0200 @@ -157,7 +157,6 @@ adding file changes added 3 changesets with 3 changes to 3 files 1 new obsolescence markers - new changesets 28b51eb45704:1d0f3cd25300 (run 'hg update' to get a working copy) ## post pull state # obstore: main
--- a/tests/test-exchange-obsmarkers-case-C2.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-C2.t Fri Oct 20 15:30:42 2017 +0200 @@ -131,7 +131,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers - new changesets e5ea8f9c7314 (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -179,7 +178,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers - new changesets e5ea8f9c7314 (run 'hg update' to get a working copy) ## post pull state # obstore: main
--- a/tests/test-exchange-obsmarkers-case-D1.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-D1.t Fri Oct 20 15:30:42 2017 +0200 @@ -127,7 +127,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers - new changesets e5ea8f9c7314 (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -175,7 +174,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers - new changesets e5ea8f9c7314 (run 'hg update' to get a working copy) ## post pull state # obstore: main
--- a/tests/test-exchange-obsmarkers-case-D4.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-exchange-obsmarkers-case-D4.t Fri Oct 20 15:30:42 2017 +0200 @@ -140,7 +140,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers - new changesets e5ea8f9c7314 (run 'hg update' to get a working copy) ## post pull state # obstore: main
--- a/tests/test-inhibit.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-inhibit.t Fri Oct 20 15:30:42 2017 +0200 @@ -685,7 +685,6 @@ added 2 changesets with 1 changes to 2 files (+1 heads) 3 new obsolescence markers obsoleted 1 changesets - new changesets 210589181b14 (run 'hg heads .' to see heads, 'hg merge' to merge) Only allow direct access and check that evolve works like before
--- a/tests/test-obsolete-push.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-obsolete-push.t Fri Oct 20 15:30:42 2017 +0200 @@ -56,7 +56,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers - new changesets 1994f17a630e updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd strict-publish-client
--- a/tests/test-obsolete.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-obsolete.t Fri Oct 20 15:30:42 2017 +0200 @@ -281,7 +281,6 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers obsoleted 1 changesets - new changesets 909a0fb57e5d (run 'hg heads' to see heads, 'hg merge' to merge) $ qlog -R ../other-new 6 @@ -374,7 +373,6 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers obsoleted 1 changesets - new changesets 159dfc9fa5d3 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up -q 7 # to check rollback update behavior
--- a/tests/test-push-checkheads-partial-C1.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-push-checkheads-partial-C1.t Fri Oct 20 15:30:42 2017 +0200 @@ -51,7 +51,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-partial-C2.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-push-checkheads-partial-C2.t Fri Oct 20 15:30:42 2017 +0200 @@ -53,7 +53,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-partial-C3.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-push-checkheads-partial-C3.t Fri Oct 20 15:30:42 2017 +0200 @@ -53,7 +53,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-partial-C4.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-push-checkheads-partial-C4.t Fri Oct 20 15:30:42 2017 +0200 @@ -53,7 +53,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B2.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-push-checkheads-pruned-B2.t Fri Oct 20 15:30:42 2017 +0200 @@ -53,7 +53,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B3.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-push-checkheads-pruned-B3.t Fri Oct 20 15:30:42 2017 +0200 @@ -53,7 +53,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B4.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-push-checkheads-pruned-B4.t Fri Oct 20 15:30:42 2017 +0200 @@ -54,7 +54,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B5.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-push-checkheads-pruned-B5.t Fri Oct 20 15:30:42 2017 +0200 @@ -57,7 +57,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files - new changesets d73caddc5533:821fb21d0dd2 (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B8.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-push-checkheads-pruned-B8.t Fri Oct 20 15:30:42 2017 +0200 @@ -55,7 +55,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-superceed-A2.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-push-checkheads-superceed-A2.t Fri Oct 20 15:30:42 2017 +0200 @@ -52,7 +52,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-superceed-A3.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-push-checkheads-superceed-A3.t Fri Oct 20 15:30:42 2017 +0200 @@ -55,7 +55,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-superceed-A6.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-push-checkheads-superceed-A6.t Fri Oct 20 15:30:42 2017 +0200 @@ -59,7 +59,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) - new changesets d73caddc5533:0f88766e02d6 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-superceed-A7.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-push-checkheads-superceed-A7.t Fri Oct 20 15:30:42 2017 +0200 @@ -59,7 +59,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) - new changesets d73caddc5533:0f88766e02d6 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up 'desc(C0)' 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-unpushed-D2.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-push-checkheads-unpushed-D2.t Fri Oct 20 15:30:42 2017 +0200 @@ -57,7 +57,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-unpushed-D3.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-push-checkheads-unpushed-D3.t Fri Oct 20 15:30:42 2017 +0200 @@ -56,7 +56,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-unpushed-D4.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-push-checkheads-unpushed-D4.t Fri Oct 20 15:30:42 2017 +0200 @@ -73,7 +73,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) - new changesets d73caddc5533:0f88766e02d6 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-unpushed-D5.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-push-checkheads-unpushed-D5.t Fri Oct 20 15:30:42 2017 +0200 @@ -62,7 +62,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) - new changesets d73caddc5533:0f88766e02d6 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up 'desc(C0)' 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-sharing.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-sharing.t Fri Oct 20 15:30:42 2017 +0200 @@ -46,7 +46,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets 0dc9c9f6ab91 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Let's commit a preliminary change and push it to ``test-repo`` for @@ -88,7 +87,6 @@ added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers obsoleted 1 changesets - new changesets 60ffde5765c5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to "60ffde5765c5: fix bug 37" 1 other heads for branch "default" @@ -353,7 +351,6 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) 2 new obsolescence markers - new changesets 540ba8f317e6 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg log -G -q -r 'head()' o 4:540ba8f317e6 @@ -457,7 +454,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets 2fe6c4bd32d0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo 'better fix (alice)' >> file1 $ hg amend -u alice -m 'fix bug 24 (v2 by alice)' @@ -485,7 +481,6 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers - new changesets e3f99ce9d9cd (run 'hg heads' to see heads, 'hg merge' to merge) 2 new content-divergent changesets
--- a/tests/test-stablesort-criss-cross.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-stablesort-criss-cross.t Fri Oct 20 15:30:42 2017 +0200 @@ -608,7 +608,6 @@ adding manifests adding file changes added 1 changesets with 0 changes to 0 files - new changesets 1ea73414a91b updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd crisscross_random
--- a/tests/test-stablesort.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-stablesort.t Fri Oct 20 15:30:42 2017 +0200 @@ -145,7 +145,6 @@ adding manifests adding file changes added 4 changesets with 0 changes to 0 files - new changesets 1ea73414a91b:f0f3ef9a6cd5 updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R repo_B pull --rev 13 @@ -155,7 +154,6 @@ adding manifests adding file changes added 4 changesets with 0 changes to 0 files (+1 heads) - new changesets 66f7d451a68b:b4594d867745 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg -R repo_B pull --rev 14 pulling from $TESTTMP/repo_A (glob) @@ -164,7 +162,6 @@ adding manifests adding file changes added 1 changesets with 0 changes to 0 files (+1 heads) - new changesets 43227190fef8 (run 'hg heads .' to see heads, 'hg merge' to merge) $ hg -R repo_B pull pulling from $TESTTMP/repo_A (glob) @@ -173,7 +170,6 @@ adding manifests adding file changes added 7 changesets with 0 changes to 0 files (+3 heads) - new changesets 2702dd0c91e7:1d8d22637c2d (run 'hg heads .' to see heads, 'hg merge' to merge) $ hg -R repo_B log -G o 15 1d8d22637c2d r15 tip @@ -215,7 +211,6 @@ adding manifests adding file changes added 7 changesets with 0 changes to 0 files - new changesets 1ea73414a91b:ff43616e5d0f updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R repo_C pull --rev 12 @@ -225,7 +220,6 @@ adding manifests adding file changes added 2 changesets with 0 changes to 0 files (+1 heads) - new changesets bab5d5bf48bd:e46a4836065c (run 'hg heads' to see heads, 'hg merge' to merge) $ hg -R repo_C pull --rev 15 pulling from $TESTTMP/repo_A (glob) @@ -234,7 +228,6 @@ adding manifests adding file changes added 4 changesets with 0 changes to 0 files (+1 heads) - new changesets 4c748ffd1a46:1d8d22637c2d (run 'hg heads .' to see heads, 'hg merge' to merge) $ hg -R repo_C pull pulling from $TESTTMP/repo_A (glob) @@ -243,7 +236,6 @@ adding manifests adding file changes added 3 changesets with 0 changes to 0 files (+3 heads) - new changesets 2702dd0c91e7:b4594d867745 (run 'hg heads .' to see heads, 'hg merge' to merge) $ hg -R repo_C log -G o 15 b4594d867745 r13 tip @@ -285,7 +277,6 @@ adding manifests adding file changes added 2 changesets with 0 changes to 0 files - new changesets 1ea73414a91b:fa942426a6fd updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R repo_D pull --rev 10 @@ -295,7 +286,6 @@ adding manifests adding file changes added 5 changesets with 0 changes to 0 files - new changesets 66f7d451a68b:ff43616e5d0f (run 'hg update' to get a working copy) $ hg -R repo_D pull --rev 15 pulling from $TESTTMP/repo_A (glob) @@ -304,7 +294,6 @@ adding manifests adding file changes added 4 changesets with 0 changes to 0 files (+1 heads) - new changesets 4c748ffd1a46:1d8d22637c2d (run 'hg heads' to see heads, 'hg merge' to merge) $ hg -R repo_D pull pulling from $TESTTMP/repo_A (glob) @@ -313,7 +302,6 @@ adding manifests adding file changes added 5 changesets with 0 changes to 0 files (+4 heads) - new changesets 2702dd0c91e7:b4594d867745 (run 'hg heads .' to see heads, 'hg merge' to merge) $ hg -R repo_D log -G o 15 b4594d867745 r13 tip @@ -423,7 +411,6 @@ adding manifests adding file changes added 5 changesets with 0 changes to 0 files - new changesets 1ea73414a91b:43227190fef8 updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R repo_E pull --rev e7d9710d9fc6 @@ -433,7 +420,6 @@ adding manifests adding file changes added 1 changesets with 0 changes to 0 files (+1 heads) - new changesets e7d9710d9fc6 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg clone repo_A repo_F --rev "1d8d22637c2d" @@ -441,7 +427,6 @@ adding manifests adding file changes added 8 changesets with 0 changes to 0 files - new changesets 1ea73414a91b:1d8d22637c2d updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R repo_F pull --rev d62d843c9a01 @@ -451,7 +436,6 @@ adding manifests adding file changes added 2 changesets with 0 changes to 0 files (+1 heads) - new changesets e7d9710d9fc6:d62d843c9a01 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg clone repo_A repo_G --rev "e7d9710d9fc6" @@ -459,7 +443,6 @@ adding manifests adding file changes added 5 changesets with 0 changes to 0 files - new changesets 1ea73414a91b:e7d9710d9fc6 updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R repo_G pull --rev 43227190fef8 @@ -469,7 +452,6 @@ adding manifests adding file changes added 1 changesets with 0 changes to 0 files (+1 heads) - new changesets 43227190fef8 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg -R repo_G pull --rev 2702dd0c91e7 pulling from $TESTTMP/repo_A (glob) @@ -478,7 +460,6 @@ adding manifests adding file changes added 3 changesets with 0 changes to 0 files (+1 heads) - new changesets 4c748ffd1a46:2702dd0c91e7 (run 'hg heads .' to see heads, 'hg merge' to merge) $ for x in E F G; do @@ -607,7 +588,6 @@ adding manifests adding file changes added 1 changesets with 0 changes to 0 files - new changesets 1ea73414a91b updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd recursion_random
--- a/tests/test-topic-dest.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-topic-dest.t Fri Oct 20 15:30:42 2017 +0200 @@ -274,7 +274,6 @@ adding manifests adding file changes added 3 changesets with 3 changes to 3 files - new changesets 13ec05df14e1:6482f08916a5 updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd other @@ -288,7 +287,6 @@ adding manifests adding file changes added 3 changesets with 3 changes to 3 files (+1 heads) - new changesets 6f5edd7450bb:c9c03b99196b rebasing 3:dbc48dd9e743 "c_other" $ hg log -G @ 7 () c_other
--- a/tests/test-topic-tutorial.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-topic-tutorial.t Fri Oct 20 15:30:42 2017 +0200 @@ -380,7 +380,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - new changesets 6104862e8b84 (run 'hg heads' to see heads) $ hg log -G @@ -822,7 +821,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files (+1 heads) - new changesets f2d6cacc6115:fbff9bc37a43 (run 'hg heads' to see heads) There are new changes! We can simply use ``hg rebase`` to update our @@ -1826,7 +1824,6 @@ adding file changes added 4 changesets with 4 changes to 1 files (+1 heads) 8 new obsolescence markers - new changesets b7509bd417f8:2d084ac00115 (run 'hg heads' to see heads) $ hg topics --verbose @@ -1870,7 +1867,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets 0d409663a1fd (run 'hg update' to get a working copy) $ hg update
--- a/tests/test-topic.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-topic.t Fri Oct 20 15:30:42 2017 +0200 @@ -466,7 +466,6 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files - new changesets 7c34953036d6:ae074045b7a7 active topic 'query' is now empty (run 'hg update' to get a working copy) $ hg topics @@ -481,7 +480,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - new changesets 0469d521db49 (run 'hg heads' to see heads) $ hg topics fran (1 changesets)
--- a/tests/test-tutorial.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-tutorial.t Fri Oct 20 15:30:42 2017 +0200 @@ -366,7 +366,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - new changesets 9ca060c80d74 (run 'hg heads' to see heads, 'hg merge' to merge) I now have a new head. Note that this remote head is immutable. @@ -1013,7 +1012,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets 75954b8cd933 (run 'hg update' to get a working copy) $ hg log -G o 75954b8cd933 (public): bathroom stuff @@ -1069,7 +1067,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets 75954b8cd933 (run 'hg update' to get a working copy) $ hg log -G o 75954b8cd933 (draft): bathroom stuff @@ -1210,7 +1207,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets bf1b0d202029 (run 'hg update' to get a working copy) 1 new orphan changesets @@ -1544,7 +1540,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets 99f039c5ec9e (run 'hg update' to get a working copy) $ hg log -G o 99f039c5ec9e (draft): SPAM SPAM SPAM
--- a/tests/test-wireproto-bundle1.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-wireproto-bundle1.t Fri Oct 20 15:30:42 2017 +0200 @@ -50,7 +50,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files - new changesets 8685c6d34325:4957bfdac07e (run 'hg update' to get a working copy) $ hg push -R ../other pushing to ssh://user@dummy/server @@ -90,7 +89,6 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers obsoleted 1 changesets - new changesets 9d1c114e7797 (run 'hg heads' to see heads) $ hg -R ../other pull pulling from ssh://user@dummy/server
--- a/tests/test-wireproto.t Fri Oct 20 15:30:16 2017 +0200 +++ b/tests/test-wireproto.t Fri Oct 20 15:30:42 2017 +0200 @@ -53,7 +53,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files - new changesets 8685c6d34325:4957bfdac07e (run 'hg update' to get a working copy) $ hg push -R ../other pushing to ssh://user@dummy/server @@ -95,7 +94,6 @@ obsmarker-exchange: 92 bytes received 1 new obsolescence markers obsoleted 1 changesets - new changesets 9d1c114e7797 (run 'hg heads' to see heads) $ hg -R ../other pull pulling from ssh://user@dummy/server @@ -128,7 +126,6 @@ added 1 changesets with 1 changes to 1 files obsmarker-exchange: 92 bytes received 1 new obsolescence markers - new changesets a5687ec59dd4 (run 'hg update' to get a working copy) some common hidden @@ -154,7 +151,6 @@ obsmarker-exchange: 167 bytes received 1 new obsolescence markers obsoleted 1 changesets - new changesets * (glob) (run 'hg heads' to see heads) test discovery avoid exchanging known markers