phase: report number of non-public changeset alongside the new range
When interacting with non-publishing repository or bundle, it is useful to
have some information about the phase of the changeset we just pulled.
This changeset updates the "new changesets MIN:MAX" output to also includes
phases information for non-public changesets. Displaying extra data about
non-public changesets means the output for exchange with publishing repository
(the default) is unaffected.
--- a/mercurial/scmutil.py Fri Sep 07 23:54:42 2018 -0400
+++ b/mercurial/scmutil.py Thu Aug 30 01:53:21 2018 +0200
@@ -1634,7 +1634,22 @@
revrange = minrev
else:
revrange = '%s:%s' % (minrev, maxrev)
- repo.ui.status(_('new changesets %s\n') % revrange)
+ draft = len(repo.revs('%ld and draft()', revs))
+ secret = len(repo.revs('%ld and secret()', revs))
+ if not (draft or secret):
+ msg = _('new changesets %s\n') % revrange
+ elif draft and secret:
+ msg = _('new changesets %s (%d drafts, %d secrets)\n')
+ msg %= (revrange, draft, secret)
+ elif draft:
+ msg = _('new changesets %s (%d drafts)\n')
+ msg %= (revrange, draft)
+ elif secret:
+ msg = _('new changesets %s (%d secrets)\n')
+ msg %= (revrange, secret)
+ else:
+ raise error.ProgrammingError('entered unreachable condition')
+ repo.ui.status(msg)
@reportsummary
def reportphasechanges(repo, tr):
--- a/tests/test-audit-path.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-audit-path.t Thu Aug 30 01:53:21 2018 +0200
@@ -82,7 +82,7 @@
adding manifests
adding file changes
added 5 changesets with 6 changes to 6 files (+4 heads)
- new changesets b7da9bf6b037:fc1393d727bc
+ new changesets b7da9bf6b037:fc1393d727bc (5 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
attack .hg/test
--- a/tests/test-bookmarks-pushpull.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-bookmarks-pushpull.t Thu Aug 30 01:53:21 2018 +0200
@@ -55,7 +55,7 @@
adding remote bookmark X
updating bookmark Y
adding remote bookmark Z
- new changesets 4e3505fd9583
+ new changesets 4e3505fd9583 (1 drafts)
test-hook-bookmark: X: -> 4e3505fd95835d721066b76e75dbb8cc554d7f77
test-hook-bookmark: Y: 0000000000000000000000000000000000000000 -> 4e3505fd95835d721066b76e75dbb8cc554d7f77
test-hook-bookmark: Z: -> 4e3505fd95835d721066b76e75dbb8cc554d7f77
@@ -418,7 +418,7 @@
divergent bookmark @ stored as @foo
divergent bookmark X stored as X@foo
updating bookmark Z
- new changesets 0d2164f0ce0d
+ new changesets 0d2164f0ce0d (1 drafts)
test-hook-bookmark: @foo: -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c
test-hook-bookmark: X@foo: -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c
test-hook-bookmark: Z: 4e3505fd95835d721066b76e75dbb8cc554d7f77 -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c
@@ -582,7 +582,7 @@
adding file changes
added 1 changesets with 1 changes to 1 files
updating bookmark Y
- new changesets b0a5eff05604
+ new changesets b0a5eff05604 (1 drafts)
(run 'hg update' to get a working copy)
$ hg book
* @ 1:0d2164f0ce0d
@@ -632,7 +632,7 @@
adding file changes
added 1 changesets with 1 changes to 1 files
updating bookmark Y
- new changesets 35d1ef0a8d1b
+ new changesets 35d1ef0a8d1b (1 drafts)
(run 'hg update' to get a working copy)
$ hg book
@ 1:0d2164f0ce0d
@@ -796,7 +796,7 @@
adding file changes
added 5 changesets with 5 changes to 3 files (+2 heads)
2 new obsolescence markers
- new changesets 4e3505fd9583:c922c0139ca0
+ new changesets 4e3505fd9583:c922c0139ca0 (5 drafts)
updating to bookmark @
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R cloned-bookmarks bookmarks
@@ -933,7 +933,7 @@
adding file changes
added 5 changesets with 5 changes to 3 files (+2 heads)
2 new obsolescence markers
- new changesets 4e3505fd9583:c922c0139ca0
+ new changesets 4e3505fd9583:c922c0139ca0 (5 drafts)
updating to bookmark @
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd addmarks
@@ -1225,7 +1225,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 79513d0d7716
+ new changesets 79513d0d7716 (1 drafts)
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-bookmarks.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-bookmarks.t Thu Aug 30 01:53:21 2018 +0200
@@ -694,7 +694,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
- new changesets 125c9a1d6df6:9ba5f110a0b3
+ new changesets 125c9a1d6df6:9ba5f110a0b3 (2 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
update to active bookmark if it's not the parent
--- a/tests/test-branches.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-branches.t Thu Aug 30 01:53:21 2018 +0200
@@ -91,7 +91,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 2 files
- new changesets f0e4c7f04036:33c2ceb9310b
+ new changesets f0e4c7f04036:33c2ceb9310b (3 drafts)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg update '"colon:test"'
--- a/tests/test-bundle-r.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-bundle-r.t Thu Aug 30 01:53:21 2018 +0200
@@ -5,7 +5,7 @@
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
- new changesets bfaf4b5cbf01:916f1afdef90
+ new changesets bfaf4b5cbf01:916f1afdef90 (9 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -27,7 +27,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets bfaf4b5cbf01
+ new changesets bfaf4b5cbf01 (1 drafts)
(run 'hg update' to get a working copy)
checking changesets
checking manifests
@@ -41,7 +41,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
- new changesets bfaf4b5cbf01:21f32785131f
+ new changesets bfaf4b5cbf01:21f32785131f (2 drafts)
(run 'hg update' to get a working copy)
checking changesets
checking manifests
@@ -55,7 +55,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
- new changesets bfaf4b5cbf01:4ce51a113780
+ new changesets bfaf4b5cbf01:4ce51a113780 (3 drafts)
(run 'hg update' to get a working copy)
checking changesets
checking manifests
@@ -69,7 +69,7 @@
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
- new changesets bfaf4b5cbf01:93ee6ab32777
+ new changesets bfaf4b5cbf01:93ee6ab32777 (4 drafts)
(run 'hg update' to get a working copy)
checking changesets
checking manifests
@@ -83,7 +83,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
- new changesets bfaf4b5cbf01:c70afb1ee985
+ new changesets bfaf4b5cbf01:c70afb1ee985 (2 drafts)
(run 'hg update' to get a working copy)
checking changesets
checking manifests
@@ -97,7 +97,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
- new changesets bfaf4b5cbf01:f03ae5a9b979
+ new changesets bfaf4b5cbf01:f03ae5a9b979 (3 drafts)
(run 'hg update' to get a working copy)
checking changesets
checking manifests
@@ -111,7 +111,7 @@
adding manifests
adding file changes
added 4 changesets with 5 changes to 2 files
- new changesets bfaf4b5cbf01:095cb14b1b4d
+ new changesets bfaf4b5cbf01:095cb14b1b4d (4 drafts)
(run 'hg update' to get a working copy)
checking changesets
checking manifests
@@ -125,7 +125,7 @@
adding manifests
adding file changes
added 5 changesets with 6 changes to 3 files
- new changesets bfaf4b5cbf01:faa2e4234c7a
+ new changesets bfaf4b5cbf01:faa2e4234c7a (5 drafts)
(run 'hg update' to get a working copy)
checking changesets
checking manifests
@@ -139,7 +139,7 @@
adding manifests
adding file changes
added 5 changesets with 5 changes to 2 files
- new changesets bfaf4b5cbf01:916f1afdef90
+ new changesets bfaf4b5cbf01:916f1afdef90 (5 drafts)
(run 'hg update' to get a working copy)
checking changesets
checking manifests
@@ -235,7 +235,7 @@
adding manifests
adding file changes
added 6 changesets with 4 changes to 4 files (+1 heads)
- new changesets 93ee6ab32777:916f1afdef90
+ new changesets 93ee6ab32777:916f1afdef90 (6 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
revision 8
@@ -260,7 +260,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
- new changesets 93ee6ab32777:916f1afdef90
+ new changesets 93ee6ab32777:916f1afdef90 (2 drafts)
(run 'hg update' to get a working copy)
revision 4
@@ -280,7 +280,7 @@
adding manifests
adding file changes
added 4 changesets with 3 changes to 3 files (+1 heads)
- new changesets c70afb1ee985:faa2e4234c7a
+ new changesets c70afb1ee985:faa2e4234c7a (4 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
revision 6
@@ -300,7 +300,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
- new changesets 93ee6ab32777:916f1afdef90
+ new changesets 93ee6ab32777:916f1afdef90 (2 drafts)
(run 'hg update' to get a working copy)
revision 4
@@ -334,7 +334,7 @@
adding manifests
adding file changes
added 7 changesets with 4 changes to 4 files
- new changesets 93ee6ab32777:03fc0b0e347c
+ new changesets 93ee6ab32777:03fc0b0e347c (7 drafts)
(run 'hg update' to get a working copy)
revision 9
--- a/tests/test-bundle-type.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-bundle-type.t Thu Aug 30 01:53:21 2018 +0200
@@ -18,7 +18,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets c35a0f9217e6
+ new changesets c35a0f9217e6 (1 drafts)
(run 'hg update' to get a working copy)
$ hg up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-bundle.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-bundle.t Thu Aug 30 01:53:21 2018 +0200
@@ -100,7 +100,7 @@
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
- new changesets f9ee2f85a263:aa35859c02ea
+ new changesets f9ee2f85a263:aa35859c02ea (9 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
Rollback empty
@@ -117,7 +117,7 @@
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
- new changesets f9ee2f85a263:aa35859c02ea
+ new changesets f9ee2f85a263:aa35859c02ea (9 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
Pull full.hg into test (using -R)
@@ -148,7 +148,7 @@
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
- new changesets f9ee2f85a263:aa35859c02ea
+ new changesets f9ee2f85a263:aa35859c02ea (9 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
Log -R full.hg in fresh empty
@@ -231,7 +231,7 @@
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
- new changesets f9ee2f85a263:aa35859c02ea
+ new changesets f9ee2f85a263:aa35859c02ea (9 drafts)
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=bundle*../full.hg (glob)
(run 'hg heads' to see heads, 'hg merge' to merge)
@@ -255,7 +255,7 @@
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
- new changesets f9ee2f85a263:aa35859c02ea
+ new changesets f9ee2f85a263:aa35859c02ea (9 drafts)
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=bundle:empty+full.hg
(run 'hg heads' to see heads, 'hg merge' to merge)
@@ -556,7 +556,7 @@
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
- new changesets f9ee2f85a263:aa35859c02ea
+ new changesets f9ee2f85a263:aa35859c02ea (9 drafts)
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R full-clone heads
@@ -596,12 +596,12 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets f9ee2f85a263
+ new changesets f9ee2f85a263 (1 drafts)
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 34c2bf6b0626
+ new changesets 34c2bf6b0626 (1 drafts)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
View full contents of the bundle
--- a/tests/test-bundle2-exchange.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-bundle2-exchange.t Thu Aug 30 01:53:21 2018 +0200
@@ -60,7 +60,7 @@
adding file changes
added 8 changesets with 7 changes to 7 files (+3 heads)
pre-close-tip:02de42196ebe draft
- new changesets cd010b8cd998:02de42196ebe
+ new changesets cd010b8cd998:02de42196ebe (8 drafts)
postclose-tip:02de42196ebe draft
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=unbundle HG_TXNID=TXN:$ID$ HG_TXNNAME=unbundle
bundle:*/tests/bundles/rebase.hg HG_URL=bundle:*/tests/bundles/rebase.hg (glob)
@@ -95,7 +95,7 @@
added 2 changesets with 2 changes to 2 files
1 new obsolescence markers
pre-close-tip:9520eea781bc draft
- new changesets cd010b8cd998:9520eea781bc
+ new changesets cd010b8cd998:9520eea781bc (1 drafts)
postclose-tip:9520eea781bc draft
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=9520eea781bcca16c1e15acc0ba14335a0e8e5ba HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull
file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob)
@@ -124,7 +124,7 @@
added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers
pre-close-tip:24b6387c8c8c draft
- new changesets 24b6387c8c8c
+ new changesets 24b6387c8c8c (1 drafts)
postclose-tip:24b6387c8c8c draft
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_NODE_LAST=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull
file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob)
@@ -300,7 +300,7 @@
1 new obsolescence markers
updating bookmark book_02de
pre-close-tip:02de42196ebe draft book_02de
- new changesets 02de42196ebe
+ new changesets 02de42196ebe (1 drafts)
postclose-tip:02de42196ebe draft book_02de
txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull
ssh://user@dummy/main HG_URL=ssh://user@dummy/main
@@ -326,7 +326,7 @@
1 new obsolescence markers
updating bookmark book_42cc
pre-close-tip:42ccdea3bb16 draft book_42cc
- new changesets 42ccdea3bb16
+ new changesets 42ccdea3bb16 (1 drafts)
postclose-tip:42ccdea3bb16 draft book_42cc
txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_NODE_LAST=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull
http://localhost:$HGPORT/ HG_URL=http://localhost:$HGPORT/
--- a/tests/test-bundle2-format.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-bundle2-format.t Thu Aug 30 01:53:21 2018 +0200
@@ -835,7 +835,7 @@
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+3 heads)
- new changesets cd010b8cd998:02de42196ebe
+ new changesets cd010b8cd998:02de42196ebe (8 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg log -G
--- a/tests/test-bundle2-remote-changegroup.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-bundle2-remote-changegroup.t Thu Aug 30 01:53:21 2018 +0200
@@ -106,7 +106,7 @@
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
- new changesets cd010b8cd998:02de42196ebe
+ new changesets cd010b8cd998:02de42196ebe (8 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R repo log -G
--- a/tests/test-censor.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-censor.t Thu Aug 30 01:53:21 2018 +0200
@@ -426,7 +426,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
- new changesets 075be80ac777:dcbaf17bf3a1
+ new changesets 075be80ac777:dcbaf17bf3a1 (2 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg cat -r $REV target
$ hg cat -r $CLEANREV target
@@ -461,7 +461,7 @@
adding manifests
adding file changes
added 6 changesets with 5 changes to 2 files (+1 heads)
- new changesets efbe78065929:683e4645fded
+ new changesets efbe78065929:683e4645fded (6 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg update $H2
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -487,6 +487,6 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
- new changesets e97f55b2665a
+ new changesets e97f55b2665a (1 drafts)
(run 'hg update' to get a working copy)
$ hg cat -r 0 target
--- a/tests/test-encoding.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-encoding.t Thu Aug 30 01:53:21 2018 +0200
@@ -10,7 +10,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
- new changesets 1e78a93102a3:0e5b7e3f9c4a
+ new changesets 1e78a93102a3:0e5b7e3f9c4a (2 drafts)
(run 'hg update' to get a working copy)
$ hg co
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-exchange-obsmarkers-case-A1.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-exchange-obsmarkers-case-A1.t Thu Aug 30 01:53:21 2018 +0200
@@ -103,7 +103,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
@@ -145,7 +145,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
@@ -246,7 +246,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
@@ -288,7 +288,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
--- a/tests/test-exchange-obsmarkers-case-A2.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-exchange-obsmarkers-case-A2.t Thu Aug 30 01:53:21 2018 +0200
@@ -111,7 +111,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
--- a/tests/test-exchange-obsmarkers-case-A3.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-exchange-obsmarkers-case-A3.t Thu Aug 30 01:53:21 2018 +0200
@@ -131,7 +131,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
@@ -238,7 +238,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
--- a/tests/test-exchange-obsmarkers-case-A4.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-exchange-obsmarkers-case-A4.t Thu Aug 30 01:53:21 2018 +0200
@@ -118,7 +118,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
--- a/tests/test-exchange-obsmarkers-case-A5.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-exchange-obsmarkers-case-A5.t Thu Aug 30 01:53:21 2018 +0200
@@ -126,7 +126,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
--- a/tests/test-exchange-obsmarkers-case-B3.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-exchange-obsmarkers-case-B3.t Thu Aug 30 01:53:21 2018 +0200
@@ -106,7 +106,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
--- a/tests/test-exchange-obsmarkers-case-B5.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-exchange-obsmarkers-case-B5.t Thu Aug 30 01:53:21 2018 +0200
@@ -138,7 +138,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
--- a/tests/test-exchange-obsmarkers-case-C2.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-exchange-obsmarkers-case-C2.t Thu Aug 30 01:53:21 2018 +0200
@@ -119,7 +119,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
@@ -167,7 +167,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
--- a/tests/test-exchange-obsmarkers-case-D1.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-exchange-obsmarkers-case-D1.t Thu Aug 30 01:53:21 2018 +0200
@@ -118,7 +118,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
@@ -166,7 +166,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
--- a/tests/test-exchange-obsmarkers-case-D4.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-exchange-obsmarkers-case-D4.t Thu Aug 30 01:53:21 2018 +0200
@@ -126,7 +126,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
--- a/tests/test-glog-topological.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-glog-topological.t Thu Aug 30 01:53:21 2018 +0200
@@ -16,7 +16,7 @@
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
- new changesets bfaf4b5cbf01:916f1afdef90
+ new changesets bfaf4b5cbf01:916f1afdef90 (9 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg log -G
--- a/tests/test-graft.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-graft.t Thu Aug 30 01:53:21 2018 +0200
@@ -1879,7 +1879,7 @@
adding manifests
adding file changes
added 11 changesets with 9 changes to 8 files (+4 heads)
- new changesets 9092f1db7931:6b98ff0062dd
+ new changesets 9092f1db7931:6b98ff0062dd (6 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up 9
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1894,7 +1894,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets 311dfc6cf3bf
+ new changesets 311dfc6cf3bf (1 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg graft --abort
--- a/tests/test-histedit-base.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-histedit-base.t Thu Aug 30 01:53:21 2018 +0200
@@ -16,7 +16,7 @@
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
- new changesets cd010b8cd998:02de42196ebe
+ new changesets cd010b8cd998:02de42196ebe (8 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up tip
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-histedit-commute.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-histedit-commute.t Thu Aug 30 01:53:21 2018 +0200
@@ -364,7 +364,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
- new changesets 141947992243:bd22688093b3
+ new changesets 141947992243:bd22688093b3 (3 drafts)
(run 'hg update' to get a working copy)
$ hg co tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-http-clone-r.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-http-clone-r.t Thu Aug 30 01:53:21 2018 +0200
@@ -9,7 +9,7 @@
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
- new changesets bfaf4b5cbf01:916f1afdef90
+ new changesets bfaf4b5cbf01:916f1afdef90 (9 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-incoming-outgoing.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-incoming-outgoing.t Thu Aug 30 01:53:21 2018 +0200
@@ -329,14 +329,14 @@
adding manifests
adding file changes
added 9 changesets with 9 changes to 1 files
- new changesets 00a43fa82f62:e4feb4ac9035
+ new changesets 00a43fa82f62:e4feb4ac9035 (9 drafts)
(run 'hg update' to get a working copy)
$ hg -R temp2 unbundle test2.hg
adding changesets
adding manifests
adding file changes
added 9 changesets with 9 changes to 1 files
- new changesets 00a43fa82f62:e4feb4ac9035
+ new changesets 00a43fa82f62:e4feb4ac9035 (9 drafts)
(run 'hg update' to get a working copy)
$ hg -R temp tip
changeset: 8:e4feb4ac9035
--- a/tests/test-infinitepush-bundlestore.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-infinitepush-bundlestore.t Thu Aug 30 01:53:21 2018 +0200
@@ -77,7 +77,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 20759b6926ce
+ new changesets 20759b6926ce (1 drafts)
(run 'hg update' to get a working copy)
$ hg log -G
o changeset: 1:20759b6926ce
@@ -170,7 +170,7 @@
adding file changes
added 1 changesets with 1 changes to 2 files
adding remote bookmark newbook
- new changesets 1de1d7d92f89
+ new changesets 1de1d7d92f89 (1 drafts)
(run 'hg update' to get a working copy)
$ hg log -G -T '{desc} {phase} {bookmarks}'
o new scratch commit draft scratch/mybranch
--- a/tests/test-infinitepush-ci.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-infinitepush-ci.t Thu Aug 30 01:53:21 2018 +0200
@@ -321,7 +321,7 @@
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files
- new changesets eaba929e866c:9b42578d4447
+ new changesets eaba929e866c:9b42578d4447 (1 drafts)
(run 'hg update' to get a working copy)
$ hg glog
@@ -423,7 +423,7 @@
added 1 changesets with 0 changes to 1 files (+1 heads)
1 new obsolescence markers
obsoleted 1 changesets
- new changesets 99949238d9ac
+ new changesets 99949238d9ac (1 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg glog
--- a/tests/test-infinitepush.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-infinitepush.t Thu Aug 30 01:53:21 2018 +0200
@@ -112,7 +112,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 33910bfe6ffe
+ new changesets 33910bfe6ffe (1 drafts)
(run 'hg update' to get a working copy)
$ hg log -G -T '{desc} {phase} {bookmarks}'
o testpullbycommithash1 draft
@@ -163,7 +163,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets a79b6597f322:c70aee6da07d
+ new changesets a79b6597f322:c70aee6da07d (1 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg log -r scratch/scratchontopofpublic -T '{phase}'
draft (no-eol)
--- a/tests/test-keyword.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-keyword.t Thu Aug 30 01:53:21 2018 +0200
@@ -125,7 +125,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets a2392c293916
+ new changesets a2392c293916 (1 drafts)
(run 'hg update' to get a working copy)
$ hg up a2392c293916
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -263,7 +263,7 @@
adding manifests
adding file changes
added 2 changesets with 3 changes to 3 files
- new changesets a2392c293916:ef63ca68695b
+ new changesets a2392c293916:ef63ca68695b (2 drafts)
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
--- a/tests/test-largefiles-misc.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-largefiles-misc.t Thu Aug 30 01:53:21 2018 +0200
@@ -111,7 +111,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 09a186cfa6da
+ new changesets 09a186cfa6da (1 drafts)
updating to branch default
getting changed largefiles
1 largefiles updated, 0 removed
@@ -1263,7 +1263,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets bf5e395ced2c
+ new changesets bf5e395ced2c (1 drafts)
nothing to rebase - updating instead
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-largefiles-update.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-largefiles-update.t Thu Aug 30 01:53:21 2018 +0200
@@ -456,7 +456,7 @@
adding manifests
adding file changes
added 3 changesets with 5 changes to 5 files
- new changesets 9530e27857f7:d65e59e952a9
+ new changesets 9530e27857f7:d65e59e952a9 (3 drafts)
remote turned local largefile large2 into a normal file
keep (l)argefile or use (n)ormal file? l
largefile large1 has a merge conflict
@@ -492,7 +492,7 @@
adding manifests
adding file changes
added 3 changesets with 5 changes to 5 files
- new changesets 9530e27857f7:d65e59e952a9
+ new changesets 9530e27857f7:d65e59e952a9 (3 drafts)
remote turned local largefile large2 into a normal file
keep (l)argefile or use (n)ormal file? l
largefile large1 has a merge conflict
--- a/tests/test-largefiles-wireproto.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-largefiles-wireproto.t Thu Aug 30 01:53:21 2018 +0200
@@ -51,7 +51,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets b6eb3a2e2efe
+ new changesets b6eb3a2e2efe (1 drafts)
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -64,7 +64,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets b6eb3a2e2efe
+ new changesets b6eb3a2e2efe (1 drafts)
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
#endif
@@ -236,7 +236,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets cf03e5bb9936
+ new changesets cf03e5bb9936 (1 drafts)
Archive contains largefiles
>>> import os
@@ -352,7 +352,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
- new changesets 567253b0f523:04d19c27a332
+ new changesets 567253b0f523:04d19c27a332 (2 drafts)
$ hg -R batchverifyclone verify --large --lfa
checking changesets
checking manifests
@@ -389,7 +389,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 6bba8cb6935d
+ new changesets 6bba8cb6935d (1 drafts)
(run 'hg update' to get a working copy)
$ hg -R batchverifyclone verify --lfa
checking changesets
@@ -452,7 +452,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 567253b0f523
+ new changesets 567253b0f523 (1 drafts)
updating to branch default
getting changed largefiles
1 largefiles updated, 0 removed
--- a/tests/test-largefiles.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-largefiles.t Thu Aug 30 01:53:21 2018 +0200
@@ -961,7 +961,7 @@
adding manifests
adding file changes
added 4 changesets with 10 changes to 4 files
- new changesets 30d30fe6a5be:9e8fbc4bce62
+ new changesets 30d30fe6a5be:9e8fbc4bce62 (4 drafts)
updating to branch default
getting changed largefiles
2 largefiles updated, 0 removed
@@ -1090,7 +1090,7 @@
adding manifests
adding file changes
added 2 changesets with 8 changes to 4 files
- new changesets 30d30fe6a5be:ce8896473775
+ new changesets 30d30fe6a5be:ce8896473775 (2 drafts)
updating to branch default
getting changed largefiles
2 largefiles updated, 0 removed
@@ -1104,7 +1104,7 @@
adding manifests
adding file changes
added 6 changesets with 16 changes to 8 files
- new changesets 51a0ae4d5864:daea875e9014
+ new changesets 51a0ae4d5864:daea875e9014 (6 drafts)
(run 'hg update' to get a working copy)
6 largefiles cached
@@ -1132,7 +1132,7 @@
adding manifests
adding file changes
added 6 changesets with 16 changes to 8 files
- new changesets 51a0ae4d5864:daea875e9014
+ new changesets 51a0ae4d5864:daea875e9014 (6 drafts)
calling hook changegroup.lfiles: hgext.largefiles.reposetup.checkrequireslfiles
(run 'hg update' to get a working copy)
pulling largefiles for revision 7
@@ -1205,7 +1205,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files (+1 heads)
- new changesets a381d2c8c80e
+ new changesets a381d2c8c80e (1 drafts)
rebasing 8:f574fb32bb45 "modify normal file largefile in repo d"
Invoking status precommit hook
M sub/normal4
@@ -1263,7 +1263,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files (+1 heads)
- new changesets a381d2c8c80e
+ new changesets a381d2c8c80e (1 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg rebase
rebasing 8:f574fb32bb45 "modify normal file largefile in repo d"
@@ -1669,7 +1669,7 @@
adding manifests
adding file changes
added 8 changesets with 24 changes to 10 files
- new changesets 30d30fe6a5be:daea875e9014
+ new changesets 30d30fe6a5be:daea875e9014 (8 drafts)
updating to branch default
getting changed largefiles
3 largefiles updated, 0 removed
@@ -1695,7 +1695,7 @@
adding manifests
adding file changes
added 2 changesets with 4 changes to 4 files (+1 heads)
- new changesets a381d2c8c80e:598410d3eb9a
+ new changesets a381d2c8c80e:598410d3eb9a (2 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
2 largefiles cached
$ hg merge
@@ -1771,7 +1771,7 @@
adding manifests
adding file changes
added 9 changesets with 26 changes to 10 files
- new changesets 30d30fe6a5be:a381d2c8c80e
+ new changesets 30d30fe6a5be:a381d2c8c80e (9 drafts)
updating to branch default
getting changed largefiles
3 largefiles updated, 0 removed
@@ -1784,7 +1784,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
- new changesets 598410d3eb9a
+ new changesets 598410d3eb9a (1 drafts)
$ hg log --template '{rev}:{node|short} {desc|firstline}\n'
9:598410d3eb9a modify normal file largefile in repo d
8:a381d2c8c80e modify normal file and largefile in repo b
--- a/tests/test-manifest.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-manifest.t Thu Aug 30 01:53:21 2018 +0200
@@ -15,7 +15,7 @@
adding manifests
adding file changes
added 2 changesets with 3 changes to 3 files
- new changesets b73562a03cfe:5bdc995175ba
+ new changesets b73562a03cfe:5bdc995175ba (2 drafts)
(run 'hg update' to get a working copy)
The next call is expected to return nothing:
--- a/tests/test-mq-pull-from-bundle.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-mq-pull-from-bundle.t Thu Aug 30 01:53:21 2018 +0200
@@ -90,7 +90,7 @@
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
- new changesets d7553909353d
+ new changesets d7553909353d (1 drafts)
merging series
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
$ test -f .hg/patches/hg-bundle* && echo 'temp. bundle file remained' || true
@@ -122,7 +122,7 @@
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
- new changesets d7553909353d
+ new changesets d7553909353d (1 drafts)
merging series
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-mq.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-mq.t Thu Aug 30 01:53:21 2018 +0200
@@ -782,7 +782,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 770eb8fce608
+ new changesets 770eb8fce608 (1 drafts)
(run 'hg update' to get a working copy)
--- a/tests/test-notify-changegroup.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-notify-changegroup.t Thu Aug 30 01:53:21 2018 +0200
@@ -85,7 +85,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
- new changesets cb9a9f314b8b:ba677d0156c1
+ new changesets cb9a9f314b8b:ba677d0156c1 (2 drafts)
(run 'hg update' to get a working copy)
$ hg --cwd a rollback
repository tip rolled back to revision -1 (undo unbundle)
@@ -98,7 +98,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
- new changesets cb9a9f314b8b:ba677d0156c1
+ new changesets cb9a9f314b8b:ba677d0156c1 (2 drafts)
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
--- a/tests/test-obsmarker-template.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-obsmarker-template.t Thu Aug 30 01:53:21 2018 +0200
@@ -1450,7 +1450,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)
$ hg log --hidden -G
o changeset: 2:7a230b46bf61
--- a/tests/test-obsolete-bundle-strip.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-obsolete-bundle-strip.t Thu Aug 30 01:53:21 2018 +0200
@@ -207,7 +207,7 @@
# unbundling: added 1 changesets with 1 changes to 1 files (+1 heads)
# unbundling: 2 new obsolescence markers
# unbundling: obsoleted 1 changesets
- # unbundling: new changesets cf2c22470d67
+ # unbundling: new changesets cf2c22470d67 (1 drafts)
# unbundling: (run 'hg heads' to see heads)
$ testrevs 'desc("C-A")'
@@ -247,7 +247,7 @@
# unbundling: adding file changes
# unbundling: added 2 changesets with 2 changes to 2 files (+1 heads)
# unbundling: 3 new obsolescence markers
- # unbundling: new changesets cf2c22470d67
+ # unbundling: new changesets cf2c22470d67 (1 drafts)
# unbundling: (run 'hg heads' to see heads)
chain with prune children
@@ -374,7 +374,7 @@
# unbundling: added 1 changesets with 1 changes to 1 files (+1 heads)
# unbundling: 1 new obsolescence markers
# unbundling: obsoleted 1 changesets
- # unbundling: new changesets cf2c22470d67
+ # unbundling: new changesets cf2c22470d67 (1 drafts)
# unbundling: (run 'hg heads' to see heads)
bundling multiple revisions
@@ -436,7 +436,7 @@
# unbundling: adding file changes
# unbundling: added 3 changesets with 3 changes to 3 files (+1 heads)
# unbundling: 3 new obsolescence markers
- # unbundling: new changesets cf2c22470d67
+ # unbundling: new changesets cf2c22470d67 (1 drafts)
# unbundling: (run 'hg heads' to see heads)
chain with precursors also pruned
@@ -537,7 +537,7 @@
# unbundling: adding file changes
# unbundling: added 1 changesets with 1 changes to 1 files (+1 heads)
# unbundling: 1 new obsolescence markers
- # unbundling: new changesets cf2c22470d67
+ # unbundling: new changesets cf2c22470d67 (1 drafts)
# unbundling: (run 'hg heads' to see heads)
$ testrevs 'desc("C-A")'
@@ -577,7 +577,7 @@
# unbundling: adding file changes
# unbundling: added 2 changesets with 2 changes to 2 files (+1 heads)
# unbundling: 3 new obsolescence markers
- # unbundling: new changesets cf2c22470d67
+ # unbundling: new changesets cf2c22470d67 (1 drafts)
# unbundling: (run 'hg heads' to see heads)
chain with missing prune
@@ -661,7 +661,7 @@
# unbundling: adding file changes
# unbundling: added 1 changesets with 1 changes to 1 files
# unbundling: 3 new obsolescence markers
- # unbundling: new changesets cf2c22470d67
+ # unbundling: new changesets cf2c22470d67 (1 drafts)
# unbundling: (run 'hg update' to get a working copy)
chain with precursors also pruned
@@ -741,7 +741,7 @@
# unbundling: adding file changes
# unbundling: added 1 changesets with 1 changes to 1 files
# unbundling: 3 new obsolescence markers
- # unbundling: new changesets cf2c22470d67
+ # unbundling: new changesets cf2c22470d67 (1 drafts)
# unbundling: (run 'hg update' to get a working copy)
Chain with fold and split
@@ -984,7 +984,7 @@
# unbundling: added 1 changesets with 1 changes to 1 files (+1 heads)
# unbundling: 6 new obsolescence markers
# unbundling: obsoleted 3 changesets
- # unbundling: new changesets 2f20ff6509f0
+ # unbundling: new changesets 2f20ff6509f0 (1 drafts)
# unbundling: (run 'hg heads' to see heads)
Bundle multiple revisions
@@ -1086,7 +1086,7 @@
# unbundling: added 2 changesets with 2 changes to 2 files (+2 heads)
# unbundling: 7 new obsolescence markers
# unbundling: obsoleted 2 changesets
- # unbundling: new changesets 2f20ff6509f0
+ # unbundling: new changesets 2f20ff6509f0 (1 drafts)
# unbundling: (run 'hg heads' to see heads)
* top one and initial precursors
@@ -1154,7 +1154,7 @@
# unbundling: added 2 changesets with 2 changes to 2 files (+2 heads)
# unbundling: 6 new obsolescence markers
# unbundling: obsoleted 3 changesets
- # unbundling: new changesets 2f20ff6509f0
+ # unbundling: new changesets 2f20ff6509f0 (1 drafts)
# unbundling: (run 'hg heads' to see heads)
* top one and one of the split
@@ -1223,7 +1223,7 @@
# unbundling: added 2 changesets with 2 changes to 2 files (+2 heads)
# unbundling: 7 new obsolescence markers
# unbundling: obsoleted 2 changesets
- # unbundling: new changesets 2f20ff6509f0
+ # unbundling: new changesets 2f20ff6509f0 (1 drafts)
# unbundling: (run 'hg heads' to see heads)
* all
@@ -1298,7 +1298,7 @@
# unbundling: adding file changes
# unbundling: added 5 changesets with 5 changes to 5 files (+4 heads)
# unbundling: 9 new obsolescence markers
- # unbundling: new changesets 2f20ff6509f0
+ # unbundling: new changesets 2f20ff6509f0 (1 drafts)
# unbundling: (run 'hg heads' to see heads)
changeset pruned on its own
@@ -1400,5 +1400,5 @@
# unbundling: adding file changes
# unbundling: added 2 changesets with 2 changes to 2 files
# unbundling: 1 new obsolescence markers
- # unbundling: new changesets 9ac430e15fca
+ # unbundling: new changesets 9ac430e15fca (1 drafts)
# unbundling: (run 'hg update' to get a working copy)
--- a/tests/test-obsolete-distributed.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-obsolete-distributed.t Thu Aug 30 01:53:21 2018 +0200
@@ -144,7 +144,7 @@
added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers
obsoleted 1 changesets
- new changesets 391a2bf12b1b
+ new changesets 391a2bf12b1b (1 drafts)
(run 'hg heads' to see heads)
$ hg log -G
o 4:391a2bf12b1b c_B1
@@ -271,7 +271,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
- new changesets d33b0a3a6464:ef908e42ce65
+ new changesets d33b0a3a6464:ef908e42ce65 (2 drafts)
(run 'hg update' to get a working copy)
$ hg up 'desc("c_A")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -319,7 +319,7 @@
adding file changes
added 2 changesets with 2 changes to 2 files
3 new obsolescence markers
- new changesets 5b5708a437f2:956063ac4557
+ new changesets 5b5708a437f2:956063ac4557 (2 drafts)
(run 'hg update' to get a working copy)
$ hg up 'desc("c_A")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -390,7 +390,7 @@
added 2 changesets with 0 changes to 2 files (+1 heads)
6 new obsolescence markers
obsoleted 2 changesets
- new changesets 9866d64649a5:77ae25d99ff0
+ new changesets 9866d64649a5:77ae25d99ff0 (2 drafts)
(run 'hg heads' to see heads)
$ hg debugobsolete
3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 77ae25d99ff07889e181126b1171b94bec8e5227 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'celeste'}
--- a/tests/test-obsolete.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-obsolete.t Thu Aug 30 01:53:21 2018 +0200
@@ -380,7 +380,7 @@
adding file changes
added 4 changesets with 4 changes to 4 files (+1 heads)
5 new obsolescence markers
- new changesets 1f0dee641bb7:6f9641995072
+ new changesets 1f0dee641bb7:6f9641995072 (1 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg debugobsolete
1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
@@ -486,7 +486,7 @@
adding file changes
added 4 changesets with 4 changes to 4 files (+1 heads)
5 new obsolescence markers
- new changesets 1f0dee641bb7:6f9641995072
+ new changesets 1f0dee641bb7:6f9641995072 (1 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg debugobsolete
1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
@@ -805,7 +805,7 @@
adding manifests
adding file changes
added 62 changesets with 63 changes to 9 files (+60 heads)
- new changesets 50c51b361e60:c15e9edfca13
+ new changesets 50c51b361e60:c15e9edfca13 (62 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`;
> do
@@ -1244,7 +1244,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
- new changesets 4b34ecfb0d56:44526ebb0f98
+ new changesets 4b34ecfb0d56:44526ebb0f98 (2 drafts)
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ../other-bundleoverlay
@@ -1513,7 +1513,7 @@
adding file changes
added 2 changesets with 2 changes to 2 files
1 new obsolescence markers
- new changesets e016b03fd86f:b0551702f918
+ new changesets e016b03fd86f:b0551702f918 (2 drafts)
(run 'hg update' to get a working copy)
$ hg debugobsolete | sort
e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
--- a/tests/test-phases-exchange.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-phases-exchange.t Thu Aug 30 01:53:21 2018 +0200
@@ -204,7 +204,7 @@
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files (+1 heads)
- new changesets 054250a37db4:b555f63b6063
+ new changesets 054250a37db4:b555f63b6063 (5 drafts)
test-debug-phase: new rev 0: x -> 1
test-debug-phase: new rev 1: x -> 1
test-debug-phase: new rev 2: x -> 1
@@ -238,7 +238,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
- new changesets 054250a37db4:54acac6f23ab
+ new changesets 054250a37db4:54acac6f23ab (3 drafts)
test-debug-phase: new rev 0: x -> 1
test-debug-phase: new rev 1: x -> 1
test-debug-phase: new rev 2: x -> 1
@@ -260,7 +260,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets f54f1bb90ff3
+ new changesets f54f1bb90ff3 (1 drafts)
test-debug-phase: new rev 3: x -> 1
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hgph
@@ -333,7 +333,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
- new changesets d6bcb4f74035:145e75495359
+ new changesets d6bcb4f74035:145e75495359 (2 drafts)
4 local changesets published
test-debug-phase: move rev 0: 1 -> 0
test-debug-phase: move rev 1: 1 -> 0
@@ -380,7 +380,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
- new changesets d6bcb4f74035:145e75495359
+ new changesets d6bcb4f74035:145e75495359 (2 drafts)
test-debug-phase: new rev 5: x -> 1
test-debug-phase: new rev 6: x -> 1
(run 'hg update' to get a working copy)
@@ -943,7 +943,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 435b5d83910c
+ new changesets 435b5d83910c (1 drafts)
test-debug-phase: new rev 10: x -> 1
(run 'hg update' to get a working copy)
$ hgph -R ../mu
@@ -1073,7 +1073,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 5237fb433fc8
+ new changesets 5237fb433fc8 (1 drafts)
test-debug-phase: new rev 13: x -> 1
(run 'hg update' to get a working copy)
$ hgph
@@ -1448,7 +1448,7 @@
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+1 heads)
- new changesets 426bada5c675:bb94757e651a
+ new changesets 426bada5c675:bb94757e651a (4 drafts)
test-debug-phase: new rev 0: x -> 0
test-debug-phase: new rev 1: x -> 0
test-debug-phase: new rev 2: x -> 0
@@ -1490,7 +1490,7 @@
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+1 heads)
- new changesets 426bada5c675:bb94757e651a
+ new changesets 426bada5c675:bb94757e651a (4 drafts)
test-debug-phase: new rev 0: x -> 0
test-debug-phase: new rev 1: x -> 0
test-debug-phase: new rev 2: x -> 0
@@ -1532,7 +1532,7 @@
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+1 heads)
- new changesets 426bada5c675:bb94757e651a
+ new changesets 426bada5c675:bb94757e651a (4 drafts)
test-debug-phase: new rev 0: x -> 0
test-debug-phase: new rev 1: x -> 0
test-debug-phase: new rev 2: x -> 0
--- a/tests/test-pull-bundle.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-pull-bundle.t Thu Aug 30 01:53:21 2018 +0200
@@ -59,7 +59,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets bbd179dfa0a7
+ new changesets bbd179dfa0a7 (1 drafts)
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo.pullbundle
@@ -70,7 +70,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets ed1b79f46b9a
+ new changesets ed1b79f46b9a (1 drafts)
(run 'hg update' to get a working copy)
$ hg pull -r 2
pulling from http://localhost:$HGPORT2/
@@ -79,7 +79,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets effea6de0384
+ new changesets effea6de0384 (1 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ cd ..
$ killdaemons.py
@@ -110,7 +110,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets bbd179dfa0a7:ed1b79f46b9a
+ new changesets bbd179dfa0a7:ed1b79f46b9a (3 drafts)
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ killdaemons.py
@@ -136,7 +136,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets bbd179dfa0a7
+ new changesets bbd179dfa0a7 (1 drafts)
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo.pullbundle3
--- a/tests/test-push-checkheads-partial-C1.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push-checkheads-partial-C1.t Thu Aug 30 01:53:21 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
--- a/tests/test-push-checkheads-partial-C2.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push-checkheads-partial-C2.t Thu Aug 30 01:53:21 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
--- a/tests/test-push-checkheads-partial-C3.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push-checkheads-partial-C3.t Thu Aug 30 01:53:21 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
--- a/tests/test-push-checkheads-partial-C4.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push-checkheads-partial-C4.t Thu Aug 30 01:53:21 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
--- a/tests/test-push-checkheads-pruned-B2.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push-checkheads-pruned-B2.t Thu Aug 30 01:53:21 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
--- a/tests/test-push-checkheads-pruned-B3.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push-checkheads-pruned-B3.t Thu Aug 30 01:53:21 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
--- a/tests/test-push-checkheads-pruned-B4.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push-checkheads-pruned-B4.t Thu Aug 30 01:53:21 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
--- a/tests/test-push-checkheads-pruned-B5.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push-checkheads-pruned-B5.t Thu Aug 30 01:53:21 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
--- a/tests/test-push-checkheads-pruned-B8.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push-checkheads-pruned-B8.t Thu Aug 30 01:53:21 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
--- a/tests/test-push-checkheads-superceed-A2.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push-checkheads-superceed-A2.t Thu Aug 30 01:53:21 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
--- a/tests/test-push-checkheads-superceed-A3.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push-checkheads-superceed-A3.t Thu Aug 30 01:53:21 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
--- a/tests/test-push-checkheads-superceed-A6.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push-checkheads-superceed-A6.t Thu Aug 30 01:53:21 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
--- a/tests/test-push-checkheads-superceed-A7.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push-checkheads-superceed-A7.t Thu Aug 30 01:53:21 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
--- a/tests/test-push-checkheads-unpushed-D2.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push-checkheads-unpushed-D2.t Thu Aug 30 01:53:21 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
--- a/tests/test-push-checkheads-unpushed-D3.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push-checkheads-unpushed-D3.t Thu Aug 30 01:53:21 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
--- a/tests/test-push-checkheads-unpushed-D4.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push-checkheads-unpushed-D4.t Thu Aug 30 01:53:21 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
--- a/tests/test-push-checkheads-unpushed-D5.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push-checkheads-unpushed-D5.t Thu Aug 30 01:53:21 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
--- a/tests/test-push-race.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push-race.t Thu Aug 30 01:53:21 2018 +0200
@@ -148,7 +148,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 842e2fac6304
+ new changesets 842e2fac6304 (1 drafts)
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg clone ssh://user@dummy/server client-other
@@ -157,7 +157,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 842e2fac6304
+ new changesets 842e2fac6304 (1 drafts)
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -242,7 +242,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets a9149a1428e2
+ new changesets a9149a1428e2 (1 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R ./client-other pull
pulling from ssh://user@dummy/server
@@ -251,7 +251,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets a9149a1428e2
+ new changesets a9149a1428e2 (1 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -260,7 +260,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets 98217d5a1659
+ new changesets 98217d5a1659 (1 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R server graph
@@ -364,7 +364,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 59e76faf78bd
+ new changesets 59e76faf78bd (1 drafts)
(run 'hg update' to get a working copy)
#endif
@@ -384,7 +384,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 59e76faf78bd
+ new changesets 59e76faf78bd (1 drafts)
(run 'hg update' to get a working copy)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -393,7 +393,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 51c544a58128
+ new changesets 51c544a58128 (1 drafts)
(run 'hg update' to get a working copy)
$ hg -R server graph
@@ -522,7 +522,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d9e379a8c432
+ new changesets d9e379a8c432 (1 drafts)
(run 'hg update' to get a working copy)
#endif
@@ -542,7 +542,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d9e379a8c432
+ new changesets d9e379a8c432 (1 drafts)
(run 'hg update' to get a working copy)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -551,7 +551,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets d603e2c0cdd7
+ new changesets d603e2c0cdd7 (1 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R server graph
@@ -693,7 +693,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets 833be552cfe6
+ new changesets 833be552cfe6 (1 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
#endif
@@ -713,7 +713,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets 833be552cfe6
+ new changesets 833be552cfe6 (1 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -722,7 +722,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets 75d69cba5402
+ new changesets 75d69cba5402 (1 drafts)
(run 'hg heads' to see heads)
$ hg -R server graph
@@ -878,7 +878,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets 89420bf00fae
+ new changesets 89420bf00fae (1 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
#endif
@@ -899,7 +899,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets 89420bf00fae
+ new changesets 89420bf00fae (1 drafts)
(run 'hg heads' to see heads)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -908,7 +908,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets b35ed749f288
+ new changesets b35ed749f288 (1 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R server graph
@@ -1026,7 +1026,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets cac2cead0ff0
+ new changesets cac2cead0ff0 (1 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R ./client-other pull
pulling from ssh://user@dummy/server
@@ -1035,7 +1035,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets cac2cead0ff0
+ new changesets cac2cead0ff0 (1 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -1044,7 +1044,7 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files
- new changesets be705100c623
+ new changesets be705100c623 (1 drafts)
(run 'hg update' to get a working copy)
$ hg -R server graph
@@ -1169,7 +1169,7 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files
- new changesets 866a66e18630
+ new changesets 866a66e18630 (1 drafts)
(run 'hg update' to get a working copy)
(creates named branch on head)
@@ -1191,7 +1191,7 @@
adding manifests
adding file changes
added 2 changesets with 0 changes to 0 files
- new changesets 866a66e18630:55a6f1c01b48
+ new changesets 866a66e18630:55a6f1c01b48 (2 drafts)
(run 'hg update' to get a working copy)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -1200,7 +1200,7 @@
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files (+1 heads)
- new changesets 6fd3090135df:55a6f1c01b48
+ new changesets 6fd3090135df:55a6f1c01b48 (2 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R server graph
@@ -1349,7 +1349,7 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
- new changesets b0ee3d6f51bc
+ new changesets b0ee3d6f51bc (1 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R ./client-other pull
pulling from ssh://user@dummy/server
@@ -1358,7 +1358,7 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
- new changesets b0ee3d6f51bc
+ new changesets b0ee3d6f51bc (1 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -1367,7 +1367,7 @@
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files (+1 heads)
- new changesets d0a85b2252a9:1b58ee3f79e5
+ new changesets d0a85b2252a9:1b58ee3f79e5 (2 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R server graph
@@ -1520,7 +1520,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files (+1 heads)
- new changesets 2efd43f7b5ba:3d57ed3c1091
+ new changesets 2efd43f7b5ba:3d57ed3c1091 (2 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R ./client-other pull
pulling from ssh://user@dummy/server
@@ -1529,7 +1529,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files (+1 heads)
- new changesets 2efd43f7b5ba:3d57ed3c1091
+ new changesets 2efd43f7b5ba:3d57ed3c1091 (2 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -1538,7 +1538,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets de7b9e2ba3f6
+ new changesets de7b9e2ba3f6 (1 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R server graph
@@ -1708,7 +1708,7 @@
1 new obsolescence markers
obsoleted 1 changesets
1 new orphan changesets
- new changesets 720c5163ecf6
+ new changesets 720c5163ecf6 (1 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R ./client-other pull
pulling from ssh://user@dummy/server
@@ -1720,7 +1720,7 @@
1 new obsolescence markers
obsoleted 1 changesets
1 new orphan changesets
- new changesets 720c5163ecf6
+ new changesets 720c5163ecf6 (1 drafts)
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -1730,7 +1730,7 @@
adding file changes
added 1 changesets with 0 changes to 0 files
1 new orphan changesets
- new changesets a98a47d8b85b
+ new changesets a98a47d8b85b (1 drafts)
(run 'hg update' to get a working copy)
$ hg -R server debugobsolete
--- a/tests/test-push.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-push.t Thu Aug 30 01:53:21 2018 +0200
@@ -11,7 +11,7 @@
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
- new changesets bfaf4b5cbf01:916f1afdef90
+ new changesets bfaf4b5cbf01:916f1afdef90 (9 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ for i in 0 1 2 3 4 5 6 7 8; do
--- a/tests/test-rebase-collapse.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-rebase-collapse.t Thu Aug 30 01:53:21 2018 +0200
@@ -540,7 +540,7 @@
adding manifests
adding file changes
added 4 changesets with 11 changes to 7 files (+1 heads)
- new changesets f447d5abf5ea:338e84e2e558
+ new changesets f447d5abf5ea:338e84e2e558 (4 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up -q tip
$ hg tglog
--- a/tests/test-rebase-conflicts.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-rebase-conflicts.t Thu Aug 30 01:53:21 2018 +0200
@@ -155,7 +155,7 @@
adding manifests
adding file changes
added 11 changesets with 8 changes to 3 files (+1 heads)
- new changesets 24797d4f68de:2f2496ddf49d
+ new changesets 24797d4f68de:2f2496ddf49d (11 drafts)
(run 'hg heads' to see heads)
$ hg up default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-rebase-named-branches.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-rebase-named-branches.t Thu Aug 30 01:53:21 2018 +0200
@@ -16,7 +16,7 @@
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
- new changesets cd010b8cd998:02de42196ebe
+ new changesets cd010b8cd998:02de42196ebe (8 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up tip
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-rebase-obsolete.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-rebase-obsolete.t Thu Aug 30 01:53:21 2018 +0200
@@ -27,7 +27,7 @@
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
- new changesets cd010b8cd998:02de42196ebe
+ new changesets cd010b8cd998:02de42196ebe (8 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up tip
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -575,7 +575,7 @@
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
- new changesets cd010b8cd998:02de42196ebe
+ new changesets cd010b8cd998:02de42196ebe (8 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up 3
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-rebase-parameters.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-rebase-parameters.t Thu Aug 30 01:53:21 2018 +0200
@@ -17,7 +17,7 @@
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
- new changesets cd010b8cd998:02de42196ebe
+ new changesets cd010b8cd998:02de42196ebe (8 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up tip
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-rebase-scenario-global.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-rebase-scenario-global.t Thu Aug 30 01:53:21 2018 +0200
@@ -18,7 +18,7 @@
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
- new changesets cd010b8cd998:02de42196ebe
+ new changesets cd010b8cd998:02de42196ebe (8 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up tip
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -421,7 +421,7 @@
adding manifests
adding file changes
added 9 changesets with 9 changes to 9 files (+2 heads)
- new changesets 9ae2ed22e576:479ddb54a924
+ new changesets 9ae2ed22e576:479ddb54a924 (9 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg tglog
o 8: 479ddb54a924 'I'
--- a/tests/test-ssh-clone-r.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-ssh-clone-r.t Thu Aug 30 01:53:21 2018 +0200
@@ -19,7 +19,7 @@
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
- new changesets bfaf4b5cbf01:916f1afdef90
+ new changesets bfaf4b5cbf01:916f1afdef90 (9 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-strip.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-strip.t Thu Aug 30 01:53:21 2018 +0200
@@ -220,7 +220,7 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
- new changesets 264128213d29
+ new changesets 264128213d29 (1 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ rm .hg/strip-backup/*
$ hg log --graph
@@ -1123,7 +1123,7 @@
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
- new changesets 35358f982181:4cf5e92caec2
+ new changesets 35358f982181:4cf5e92caec2 (2 drafts)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg strip -k -r 35358f982181
--- a/tests/test-symlink-os-yes-fs-no.py.out Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-symlink-os-yes-fs-no.py.out Thu Aug 30 01:53:21 2018 +0200
@@ -2,11 +2,11 @@
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
-new changesets d326ae2d01ee
+new changesets d326ae2d01ee (1 drafts)
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding changesets
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
-new changesets d326ae2d01ee
+new changesets d326ae2d01ee (1 drafts)
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-treemanifest.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-treemanifest.t Thu Aug 30 01:53:21 2018 +0200
@@ -341,7 +341,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 51cfd7b1e13b
+ new changesets 51cfd7b1e13b (1 drafts)
(run 'hg update' to get a working copy)
$ hg --config extensions.strip= strip tip
saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob)
--- a/tests/test-unionrepo.t Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-unionrepo.t Thu Aug 30 01:53:21 2018 +0200
@@ -128,7 +128,7 @@
adding manifests
adding file changes
added 6 changesets with 11 changes to 6 files (+1 heads)
- new changesets f093fec0529b:2f0d178c469c
+ new changesets f093fec0529b:2f0d178c469c (6 drafts)
$ hg -R repo3 paths
default = union:repo1+repo2