--- a/tests/test-evolve-content-divergence.t Fri Oct 12 14:55:37 2018 +0200
+++ b/tests/test-evolve-content-divergence.t Fri Oct 12 14:55:46 2018 +0200
@@ -793,7 +793,7 @@
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files
- new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts)
+ new changesets 8fa14d15e168:c41c793e0ef1
(run 'hg update' to get a working copy)
$ hg glog
o 4:c41c793e0ef1 added d
@@ -865,7 +865,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 (4 drafts)
+ new changesets 82b74d5dc678:15c781f93cac
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg glog
--- a/tests/test-evolve-obshistory.t Fri Oct 12 14:55:37 2018 +0200
+++ b/tests/test-evolve-obshistory.t Fri Oct 12 14:55:46 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 (1 drafts)
+ 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-phase-divergence.t Fri Oct 12 14:55:37 2018 +0200
+++ b/tests/test-evolve-phase-divergence.t Fri Oct 12 14:55:46 2018 +0200
@@ -80,7 +80,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 4d1169d82e47 (1 drafts)
+ new changesets 4d1169d82e47
(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 (1 drafts)
+ new changesets aa071e5554e3
(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 (1 drafts)
+ new changesets b756eb10ea73
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 (1 drafts)
+ new changesets 502e73736632:2352021b3785
(run 'hg update' to get a working copy)
$ hg push ../public
pushing to ../public
--- a/tests/test-evolve-serveronly-bundle2.t Fri Oct 12 14:55:37 2018 +0200
+++ b/tests/test-evolve-serveronly-bundle2.t Fri Oct 12 14:55:46 2018 +0200
@@ -72,7 +72,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
- new changesets 8685c6d34325:4957bfdac07e (2 drafts)
+ new changesets 8685c6d34325:4957bfdac07e
(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 (1 drafts)
+ new changesets 9d1c114e7797
(run 'hg heads' to see heads)
$ cat ../errors.log
$ hg -R ../other pull
--- a/tests/test-evolve-templates.t Fri Oct 12 14:55:37 2018 +0200
+++ b/tests/test-evolve-templates.t Fri Oct 12 14:55:46 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 (1 drafts)
+ 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.t Fri Oct 12 14:55:37 2018 +0200
+++ b/tests/test-evolve.t Fri Oct 12 14:55:46 2018 +0200
@@ -507,7 +507,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 702e4d0a6d86 (1 drafts)
+ new changesets 702e4d0a6d86
$ cd alpha
$ cat << EOF > A
@@ -566,7 +566,7 @@
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
- new changesets c6dda801837c (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-A1.t Fri Oct 12 14:55:46 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 (1 drafts)
+ new changesets f5bc6836db60
(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 (1 drafts)
+ new changesets f5bc6836db60
(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 (2 drafts)
+ new changesets f5bc6836db60:f6fbb35d8ac9
(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 (2 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-A2.t Fri Oct 12 14:55:46 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 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-A3.t Fri Oct 12 14:55:46 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 (1 drafts)
+ new changesets e5ea8f9c7314
(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 (1 drafts)
+ new changesets e5ea8f9c7314
(run 'hg heads' to see heads, 'hg merge' to merge)
## post pull state
# obstore: main
--- a/tests/test-exchange-obsmarkers-case-A4.t Fri Oct 12 14:55:37 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-A4.t Fri Oct 12 14:55:46 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 (2 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-A5.t Fri Oct 12 14:55:46 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 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-B3.t Fri Oct 12 14:55:46 2018 +0200
@@ -120,7 +120,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets f5bc6836db60 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-B5.t Fri Oct 12 14:55:46 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 (3 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-C2.t Fri Oct 12 14:55:46 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 (1 drafts)
+ new changesets e5ea8f9c7314
(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 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-D1.t Fri Oct 12 14:55:46 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 (1 drafts)
+ new changesets e5ea8f9c7314
(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 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-D4.t Fri Oct 12 14:55:46 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 (1 drafts)
+ new changesets e5ea8f9c7314
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
--- a/tests/test-obsolete.t Fri Oct 12 14:55:37 2018 +0200
+++ b/tests/test-obsolete.t Fri Oct 12 14:55:46 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 (1 drafts)
+ new changesets 909a0fb57e5d
(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 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-push-checkheads-partial-C1.t Fri Oct 12 14:55:46 2018 +0200
@@ -51,7 +51,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-push-checkheads-partial-C2.t Fri Oct 12 14:55:46 2018 +0200
@@ -53,7 +53,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-push-checkheads-partial-C3.t Fri Oct 12 14:55:46 2018 +0200
@@ -53,7 +53,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-push-checkheads-partial-C4.t Fri Oct 12 14:55:46 2018 +0200
@@ -53,7 +53,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-push-checkheads-pruned-B2.t Fri Oct 12 14:55:46 2018 +0200
@@ -53,7 +53,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-push-checkheads-pruned-B3.t Fri Oct 12 14:55:46 2018 +0200
@@ -53,7 +53,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-push-checkheads-pruned-B4.t Fri Oct 12 14:55:46 2018 +0200
@@ -54,7 +54,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-push-checkheads-pruned-B5.t Fri Oct 12 14:55:46 2018 +0200
@@ -57,7 +57,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
- new changesets d73caddc5533:821fb21d0dd2 (2 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-push-checkheads-pruned-B8.t Fri Oct 12 14:55:46 2018 +0200
@@ -55,7 +55,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-push-checkheads-superceed-A2.t Fri Oct 12 14:55:46 2018 +0200
@@ -52,7 +52,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-push-checkheads-superceed-A3.t Fri Oct 12 14:55:46 2018 +0200
@@ -55,7 +55,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-push-checkheads-superceed-A6.t Fri Oct 12 14:55:46 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 (2 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-push-checkheads-superceed-A7.t Fri Oct 12 14:55:46 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 (2 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-push-checkheads-unpushed-D2.t Fri Oct 12 14:55:46 2018 +0200
@@ -57,7 +57,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-push-checkheads-unpushed-D3.t Fri Oct 12 14:55:46 2018 +0200
@@ -56,7 +56,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-push-checkheads-unpushed-D4.t Fri Oct 12 14:55:46 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 (2 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-push-checkheads-unpushed-D5.t Fri Oct 12 14:55:46 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 (2 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-sharing.t Fri Oct 12 14:55:46 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 (1 drafts)
+ 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"
@@ -457,7 +457,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 2fe6c4bd32d0 (1 drafts)
+ 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)'
@@ -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 (1 drafts)
+ new changesets e3f99ce9d9cd
(run 'hg heads' to see heads, 'hg merge' to merge)
Figure SG09: multiple heads! divergence! oh my!
--- a/tests/test-topic-dest.t Fri Oct 12 14:55:37 2018 +0200
+++ b/tests/test-topic-dest.t Fri Oct 12 14:55:46 2018 +0200
@@ -276,7 +276,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
- new changesets 13ec05df14e1:6482f08916a5 (3 drafts)
+ new changesets 13ec05df14e1:6482f08916a5
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 (3 drafts)
+ new changesets 6f5edd7450bb:c9c03b99196b
rebasing 3:dbc48dd9e743 "c_other"
$ hg log -G
@ 7 () c_other
--- a/tests/test-topic-tutorial.t Fri Oct 12 14:55:37 2018 +0200
+++ b/tests/test-topic-tutorial.t Fri Oct 12 14:55:46 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 (4 drafts)
+ new changesets b7509bd417f8:2d084ac00115
(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 (1 drafts)
+ new changesets 0d409663a1fd
(run 'hg update' to get a working copy)
$ hg update
--- a/tests/test-topic.t Fri Oct 12 14:55:37 2018 +0200
+++ b/tests/test-topic.t Fri Oct 12 14:55:46 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 (1 drafts)
+ new changesets 0469d521db49
(run 'hg heads' to see heads)
$ hg topics
fran (1 changesets)
--- a/tests/test-tutorial.t Fri Oct 12 14:55:37 2018 +0200
+++ b/tests/test-tutorial.t Fri Oct 12 14:55:46 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 (1 drafts)
+ new changesets 4710c0968793
(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 (1 drafts)
+ new changesets e4e4fa805d92
(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 (1 drafts)
+ new changesets fc41faf45288
(run 'hg update' to get a working copy)
$ hg log -G
o fc41faf45288 (draft): SPAM SPAM SPAM
--- a/tests/test-wireproto-bundle1.t Fri Oct 12 14:55:37 2018 +0200
+++ b/tests/test-wireproto-bundle1.t Fri Oct 12 14:55:46 2018 +0200
@@ -50,7 +50,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
- new changesets 8685c6d34325:4957bfdac07e (2 drafts)
+ new changesets 8685c6d34325:4957bfdac07e
(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 (1 drafts)
+ 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 12 14:55:37 2018 +0200
+++ b/tests/test-wireproto.t Fri Oct 12 14:55:46 2018 +0200
@@ -53,7 +53,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
- new changesets 8685c6d34325:4957bfdac07e (2 drafts)
+ new changesets 8685c6d34325:4957bfdac07e
(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 (1 drafts)
+ new changesets 9d1c114e7797
(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 (1 drafts)
+ new changesets a5687ec59dd4
(run 'hg update' to get a working copy)
some common hidden