# HG changeset patch # User Pierre-Yves David # Date 1536746021 -7200 # Node ID ef22eef37ecce4408cfe2b2aa6fc0fe2748cb946 # Parent 6f391c2a773b51c1d597bdea278d2c039450fe98 test: update output to match new "pull" phase report CORE-TEST-OUTPUT-UPDATE: 89630d0b3e23 diff -r 6f391c2a773b -r ef22eef37ecc tests/test-evolve-content-divergence.t --- a/tests/test-evolve-content-divergence.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-evolve-content-divergence.t Wed Sep 12 11:53:41 2018 +0200 @@ -794,7 +794,7 @@ adding manifests adding file changes added 5 changesets with 5 changes to 5 files - new changesets 8fa14d15e168:c41c793e0ef1 + new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts) (run 'hg update' to get a working copy) $ hg glog o 4:c41c793e0ef1 added d @@ -870,7 +870,7 @@ added 4 changesets with 0 changes to 4 files (+1 heads) 5 new obsolescence markers 8 new content-divergent changesets - new changesets 82b74d5dc678:15c781f93cac + new changesets 82b74d5dc678:15c781f93cac (4 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg glog diff -r 6f391c2a773b -r ef22eef37ecc tests/test-evolve-obshistory.t --- a/tests/test-evolve-obshistory.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-evolve-obshistory.t Wed Sep 12 11:53:41 2018 +0200 @@ -126,7 +126,7 @@ added 1 changesets with 0 changes to 1 files (+1 heads) 2 new obsolescence markers obsoleted 1 changesets - new changesets 7a230b46bf61 + new changesets 7a230b46bf61 (1 drafts) (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) diff -r 6f391c2a773b -r ef22eef37ecc tests/test-evolve-phase-divergence.t --- a/tests/test-evolve-phase-divergence.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-evolve-phase-divergence.t Wed Sep 12 11:53:41 2018 +0200 @@ -80,7 +80,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets 4d1169d82e47 + new changesets 4d1169d82e47 (1 drafts) (run 'hg update' to get a working copy) $ hg glog @@ -260,7 +260,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets aa071e5554e3 + new changesets aa071e5554e3 (1 drafts) (run 'hg update' to get a working copy) $ hg push ../public @@ -414,7 +414,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets b756eb10ea73 + new changesets b756eb10ea73 (1 drafts) 1 local changesets published (run 'hg update' to get a working copy) @@ -545,7 +545,7 @@ adding file changes added 2 changesets with 2 changes to 2 files 2 new obsolescence markers - new changesets 502e73736632:2352021b3785 + new changesets 502e73736632:2352021b3785 (1 drafts) (run 'hg update' to get a working copy) $ hg push ../public pushing to ../public diff -r 6f391c2a773b -r ef22eef37ecc tests/test-evolve-serveronly-bundle2.t --- a/tests/test-evolve-serveronly-bundle2.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-evolve-serveronly-bundle2.t Wed Sep 12 11:53:41 2018 +0200 @@ -72,7 +72,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files - new changesets 8685c6d34325:4957bfdac07e + new changesets 8685c6d34325:4957bfdac07e (2 drafts) (run 'hg update' to get a working copy) $ cat ../errors.log $ hg push -R ../other @@ -130,7 +130,7 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers obsoleted 1 changesets - new changesets 9d1c114e7797 + new changesets 9d1c114e7797 (1 drafts) (run 'hg heads' to see heads) $ cat ../errors.log $ hg -R ../other pull diff -r 6f391c2a773b -r ef22eef37ecc tests/test-evolve-templates.t --- a/tests/test-evolve-templates.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-evolve-templates.t Wed Sep 12 11:53:41 2018 +0200 @@ -1004,7 +1004,7 @@ added 1 changesets with 0 changes to 1 files (+1 heads) 2 new obsolescence markers obsoleted 1 changesets - new changesets 7a230b46bf61 + new changesets 7a230b46bf61 (1 drafts) (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) diff -r 6f391c2a773b -r ef22eef37ecc tests/test-evolve.t --- a/tests/test-evolve.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-evolve.t Wed Sep 12 11:53:41 2018 +0200 @@ -508,7 +508,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets 702e4d0a6d86 + new changesets 702e4d0a6d86 (1 drafts) $ cd alpha $ cat << EOF > A @@ -567,7 +567,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets c6dda801837c + new changesets c6dda801837c (1 drafts) (run 'hg update' to get a working copy) $ hg up 2 files updated, 0 files merged, 0 files removed, 0 files unresolved diff -r 6f391c2a773b -r ef22eef37ecc tests/test-exchange-obsmarkers-case-A1.t --- a/tests/test-exchange-obsmarkers-case-A1.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-A1.t Wed Sep 12 11:53:41 2018 +0200 @@ -113,7 +113,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets f5bc6836db60 + new changesets f5bc6836db60 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -155,7 +155,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets f5bc6836db60 + new changesets f5bc6836db60 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -269,7 +269,7 @@ adding file changes added 2 changesets with 2 changes to 2 files 1 new obsolescence markers - new changesets f5bc6836db60:f6fbb35d8ac9 + new changesets f5bc6836db60:f6fbb35d8ac9 (2 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -311,7 +311,7 @@ adding file changes added 2 changesets with 2 changes to 2 files 1 new obsolescence markers - new changesets f5bc6836db60:f6fbb35d8ac9 + new changesets f5bc6836db60:f6fbb35d8ac9 (2 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main diff -r 6f391c2a773b -r ef22eef37ecc tests/test-exchange-obsmarkers-case-A2.t --- a/tests/test-exchange-obsmarkers-case-A2.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-A2.t Wed Sep 12 11:53:41 2018 +0200 @@ -124,7 +124,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets f5bc6836db60 + new changesets f5bc6836db60 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main diff -r 6f391c2a773b -r ef22eef37ecc tests/test-exchange-obsmarkers-case-A3.t --- a/tests/test-exchange-obsmarkers-case-A3.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-A3.t Wed Sep 12 11:53:41 2018 +0200 @@ -146,7 +146,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets e5ea8f9c7314 + new changesets e5ea8f9c7314 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -268,7 +268,7 @@ 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets - new changesets e5ea8f9c7314 + new changesets e5ea8f9c7314 (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) ## post pull state # obstore: main diff -r 6f391c2a773b -r ef22eef37ecc tests/test-exchange-obsmarkers-case-A4.t --- a/tests/test-exchange-obsmarkers-case-A4.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-A4.t Wed Sep 12 11:53:41 2018 +0200 @@ -134,7 +134,7 @@ adding file changes added 2 changesets with 2 changes to 2 files 1 new obsolescence markers - new changesets 28b51eb45704:06055a7959d4 + new changesets 28b51eb45704:06055a7959d4 (2 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main diff -r 6f391c2a773b -r ef22eef37ecc tests/test-exchange-obsmarkers-case-A5.t --- a/tests/test-exchange-obsmarkers-case-A5.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-A5.t Wed Sep 12 11:53:41 2018 +0200 @@ -141,7 +141,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets f6298a8ac3a4 + new changesets f6298a8ac3a4 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main diff -r 6f391c2a773b -r ef22eef37ecc tests/test-exchange-obsmarkers-case-B3.t --- a/tests/test-exchange-obsmarkers-case-B3.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-B3.t Wed Sep 12 11:53:41 2018 +0200 @@ -120,7 +120,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets f5bc6836db60 + new changesets f5bc6836db60 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main diff -r 6f391c2a773b -r ef22eef37ecc tests/test-exchange-obsmarkers-case-B5.t --- a/tests/test-exchange-obsmarkers-case-B5.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-B5.t Wed Sep 12 11:53:41 2018 +0200 @@ -158,7 +158,7 @@ adding file changes added 3 changesets with 3 changes to 3 files 1 new obsolescence markers - new changesets 28b51eb45704:1d0f3cd25300 + new changesets 28b51eb45704:1d0f3cd25300 (3 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main diff -r 6f391c2a773b -r ef22eef37ecc tests/test-exchange-obsmarkers-case-C2.t --- a/tests/test-exchange-obsmarkers-case-C2.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-C2.t Wed Sep 12 11:53:41 2018 +0200 @@ -131,7 +131,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers - new changesets e5ea8f9c7314 + new changesets e5ea8f9c7314 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -179,7 +179,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers - new changesets e5ea8f9c7314 + new changesets e5ea8f9c7314 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main diff -r 6f391c2a773b -r ef22eef37ecc tests/test-exchange-obsmarkers-case-D1.t --- a/tests/test-exchange-obsmarkers-case-D1.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-D1.t Wed Sep 12 11:53:41 2018 +0200 @@ -128,7 +128,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers - new changesets e5ea8f9c7314 + new changesets e5ea8f9c7314 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -176,7 +176,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers - new changesets e5ea8f9c7314 + new changesets e5ea8f9c7314 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main diff -r 6f391c2a773b -r ef22eef37ecc tests/test-exchange-obsmarkers-case-D4.t --- a/tests/test-exchange-obsmarkers-case-D4.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-exchange-obsmarkers-case-D4.t Wed Sep 12 11:53:41 2018 +0200 @@ -141,7 +141,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers - new changesets e5ea8f9c7314 + new changesets e5ea8f9c7314 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main diff -r 6f391c2a773b -r ef22eef37ecc tests/test-obsolete.t --- a/tests/test-obsolete.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-obsolete.t Wed Sep 12 11:53:41 2018 +0200 @@ -284,7 +284,7 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers obsoleted 1 changesets - new changesets 909a0fb57e5d + new changesets 909a0fb57e5d (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ qlog -R ../other-new 6 @@ -377,7 +377,7 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers obsoleted 1 changesets - new changesets 159dfc9fa5d3 + new changesets 159dfc9fa5d3 (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up -q 7 # to check rollback update behavior diff -r 6f391c2a773b -r ef22eef37ecc tests/test-push-checkheads-partial-C1.t --- a/tests/test-push-checkheads-partial-C1.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-push-checkheads-partial-C1.t Wed Sep 12 11:53:41 2018 +0200 @@ -51,7 +51,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved diff -r 6f391c2a773b -r ef22eef37ecc tests/test-push-checkheads-partial-C2.t --- a/tests/test-push-checkheads-partial-C2.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-push-checkheads-partial-C2.t Wed Sep 12 11:53:41 2018 +0200 @@ -53,7 +53,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved diff -r 6f391c2a773b -r ef22eef37ecc tests/test-push-checkheads-partial-C3.t --- a/tests/test-push-checkheads-partial-C3.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-push-checkheads-partial-C3.t Wed Sep 12 11:53:41 2018 +0200 @@ -53,7 +53,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved diff -r 6f391c2a773b -r ef22eef37ecc tests/test-push-checkheads-partial-C4.t --- a/tests/test-push-checkheads-partial-C4.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-push-checkheads-partial-C4.t Wed Sep 12 11:53:41 2018 +0200 @@ -53,7 +53,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved diff -r 6f391c2a773b -r ef22eef37ecc tests/test-push-checkheads-pruned-B2.t --- a/tests/test-push-checkheads-pruned-B2.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-push-checkheads-pruned-B2.t Wed Sep 12 11:53:41 2018 +0200 @@ -53,7 +53,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved diff -r 6f391c2a773b -r ef22eef37ecc tests/test-push-checkheads-pruned-B3.t --- a/tests/test-push-checkheads-pruned-B3.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-push-checkheads-pruned-B3.t Wed Sep 12 11:53:41 2018 +0200 @@ -53,7 +53,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved diff -r 6f391c2a773b -r ef22eef37ecc tests/test-push-checkheads-pruned-B4.t --- a/tests/test-push-checkheads-pruned-B4.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-push-checkheads-pruned-B4.t Wed Sep 12 11:53:41 2018 +0200 @@ -54,7 +54,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved diff -r 6f391c2a773b -r ef22eef37ecc tests/test-push-checkheads-pruned-B5.t --- a/tests/test-push-checkheads-pruned-B5.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-push-checkheads-pruned-B5.t Wed Sep 12 11:53:41 2018 +0200 @@ -57,7 +57,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files - new changesets d73caddc5533:821fb21d0dd2 + new changesets d73caddc5533:821fb21d0dd2 (2 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved diff -r 6f391c2a773b -r ef22eef37ecc tests/test-push-checkheads-pruned-B8.t --- a/tests/test-push-checkheads-pruned-B8.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-push-checkheads-pruned-B8.t Wed Sep 12 11:53:41 2018 +0200 @@ -55,7 +55,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved diff -r 6f391c2a773b -r ef22eef37ecc tests/test-push-checkheads-superceed-A2.t --- a/tests/test-push-checkheads-superceed-A2.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-push-checkheads-superceed-A2.t Wed Sep 12 11:53:41 2018 +0200 @@ -52,7 +52,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved diff -r 6f391c2a773b -r ef22eef37ecc tests/test-push-checkheads-superceed-A3.t --- a/tests/test-push-checkheads-superceed-A3.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-push-checkheads-superceed-A3.t Wed Sep 12 11:53:41 2018 +0200 @@ -55,7 +55,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved diff -r 6f391c2a773b -r ef22eef37ecc tests/test-push-checkheads-superceed-A6.t --- a/tests/test-push-checkheads-superceed-A6.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-push-checkheads-superceed-A6.t Wed Sep 12 11:53:41 2018 +0200 @@ -59,7 +59,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) - new changesets d73caddc5533:0f88766e02d6 + new changesets d73caddc5533:0f88766e02d6 (2 drafts) (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 diff -r 6f391c2a773b -r ef22eef37ecc tests/test-push-checkheads-superceed-A7.t --- a/tests/test-push-checkheads-superceed-A7.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-push-checkheads-superceed-A7.t Wed Sep 12 11:53:41 2018 +0200 @@ -59,7 +59,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) - new changesets d73caddc5533:0f88766e02d6 + new changesets d73caddc5533:0f88766e02d6 (2 drafts) (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 diff -r 6f391c2a773b -r ef22eef37ecc tests/test-push-checkheads-unpushed-D2.t --- a/tests/test-push-checkheads-unpushed-D2.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-push-checkheads-unpushed-D2.t Wed Sep 12 11:53:41 2018 +0200 @@ -57,7 +57,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved diff -r 6f391c2a773b -r ef22eef37ecc tests/test-push-checkheads-unpushed-D3.t --- a/tests/test-push-checkheads-unpushed-D3.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-push-checkheads-unpushed-D3.t Wed Sep 12 11:53:41 2018 +0200 @@ -56,7 +56,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved diff -r 6f391c2a773b -r ef22eef37ecc tests/test-push-checkheads-unpushed-D4.t --- a/tests/test-push-checkheads-unpushed-D4.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-push-checkheads-unpushed-D4.t Wed Sep 12 11:53:41 2018 +0200 @@ -73,7 +73,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) - new changesets d73caddc5533:0f88766e02d6 + new changesets d73caddc5533:0f88766e02d6 (2 drafts) (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 diff -r 6f391c2a773b -r ef22eef37ecc tests/test-push-checkheads-unpushed-D5.t --- a/tests/test-push-checkheads-unpushed-D5.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-push-checkheads-unpushed-D5.t Wed Sep 12 11:53:41 2018 +0200 @@ -62,7 +62,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) - new changesets d73caddc5533:0f88766e02d6 + new changesets d73caddc5533:0f88766e02d6 (2 drafts) (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 diff -r 6f391c2a773b -r ef22eef37ecc tests/test-sharing.t --- a/tests/test-sharing.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-sharing.t Wed Sep 12 11:53:41 2018 +0200 @@ -88,7 +88,7 @@ added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers obsoleted 1 changesets - new changesets 60ffde5765c5 + new changesets 60ffde5765c5 (1 drafts) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to "60ffde5765c5: fix bug 37" 1 other heads for branch "default" @@ -457,7 +457,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets 2fe6c4bd32d0 + new changesets 2fe6c4bd32d0 (1 drafts) 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)' @@ -486,7 +486,7 @@ added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers 2 new content-divergent changesets - new changesets e3f99ce9d9cd + new changesets e3f99ce9d9cd (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) Figure SG09: multiple heads! divergence! oh my! diff -r 6f391c2a773b -r ef22eef37ecc tests/test-topic-dest.t --- a/tests/test-topic-dest.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-topic-dest.t Wed Sep 12 11:53:41 2018 +0200 @@ -276,7 +276,7 @@ adding manifests adding file changes added 3 changesets with 3 changes to 3 files - new changesets 13ec05df14e1:6482f08916a5 + new changesets 13ec05df14e1:6482f08916a5 (3 drafts) updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd other @@ -290,7 +290,7 @@ adding manifests adding file changes added 3 changesets with 3 changes to 3 files (+1 heads) - new changesets 6f5edd7450bb:c9c03b99196b + new changesets 6f5edd7450bb:c9c03b99196b (3 drafts) rebasing 3:dbc48dd9e743 "c_other" $ hg log -G @ 7 () c_other diff -r 6f391c2a773b -r ef22eef37ecc tests/test-topic-tutorial.t --- a/tests/test-topic-tutorial.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-topic-tutorial.t Wed Sep 12 11:53:41 2018 +0200 @@ -1845,7 +1845,7 @@ adding file changes added 4 changesets with 4 changes to 1 files (+1 heads) 8 new obsolescence markers - new changesets b7509bd417f8:2d084ac00115 + new changesets b7509bd417f8:2d084ac00115 (4 drafts) (run 'hg heads' to see heads) $ hg topics --verbose @@ -1889,7 +1889,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets 0d409663a1fd + new changesets 0d409663a1fd (1 drafts) (run 'hg update' to get a working copy) $ hg update diff -r 6f391c2a773b -r ef22eef37ecc tests/test-topic.t --- a/tests/test-topic.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-topic.t Wed Sep 12 11:53:41 2018 +0200 @@ -614,7 +614,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - new changesets 0469d521db49 + new changesets 0469d521db49 (1 drafts) (run 'hg heads' to see heads) $ hg topics fran (1 changesets) diff -r 6f391c2a773b -r ef22eef37ecc tests/test-tutorial.t --- a/tests/test-tutorial.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-tutorial.t Wed Sep 12 11:53:41 2018 +0200 @@ -1070,7 +1070,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets 4710c0968793 + new changesets 4710c0968793 (1 drafts) (run 'hg update' to get a working copy) $ hg log -G o 4710c0968793 (draft): bathroom stuff @@ -1212,7 +1212,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new orphan changesets - new changesets e4e4fa805d92 + new changesets e4e4fa805d92 (1 drafts) (run 'hg update' to get a working copy) The new changeset "animal" is based on an old changeset of "bathroom". You can @@ -1543,7 +1543,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets fc41faf45288 + new changesets fc41faf45288 (1 drafts) (run 'hg update' to get a working copy) $ hg log -G o fc41faf45288 (draft): SPAM SPAM SPAM diff -r 6f391c2a773b -r ef22eef37ecc tests/test-wireproto-bundle1.t --- a/tests/test-wireproto-bundle1.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-wireproto-bundle1.t Wed Sep 12 11:53:41 2018 +0200 @@ -50,7 +50,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files - new changesets 8685c6d34325:4957bfdac07e + new changesets 8685c6d34325:4957bfdac07e (2 drafts) (run 'hg update' to get a working copy) $ hg push -R ../other pushing to ssh://user@dummy/server @@ -90,7 +90,7 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers obsoleted 1 changesets - new changesets 9d1c114e7797 + new changesets 9d1c114e7797 (1 drafts) (run 'hg heads' to see heads) $ hg -R ../other pull pulling from ssh://user@dummy/server diff -r 6f391c2a773b -r ef22eef37ecc tests/test-wireproto.t --- a/tests/test-wireproto.t Wed Sep 12 10:37:14 2018 +0200 +++ b/tests/test-wireproto.t Wed Sep 12 11:53:41 2018 +0200 @@ -53,7 +53,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files - new changesets 8685c6d34325:4957bfdac07e + new changesets 8685c6d34325:4957bfdac07e (2 drafts) (run 'hg update' to get a working copy) $ hg push -R ../other pushing to ssh://user@dummy/server @@ -95,7 +95,7 @@ obsmarker-exchange: 92 bytes received 1 new obsolescence markers obsoleted 1 changesets - new changesets 9d1c114e7797 + new changesets 9d1c114e7797 (1 drafts) (run 'hg heads' to see heads) $ hg -R ../other pull pulling from ssh://user@dummy/server @@ -128,7 +128,7 @@ added 1 changesets with 1 changes to 1 files obsmarker-exchange: 92 bytes received 1 new obsolescence markers - new changesets a5687ec59dd4 + new changesets a5687ec59dd4 (1 drafts) (run 'hg update' to get a working copy) some common hidden