[PATCH 3 of 3] transaction-summary: display the range of new revisions upon pull/unbundle
Denis Laxalde
denis at laxalde.org
Wed Oct 4 16:52:45 UTC 2017
# HG changeset patch
# User Denis Laxalde <denis.laxalde at logilab.fr>
# Date 1507135871 -7200
# Wed Oct 04 18:51:11 2017 +0200
# Node ID ae007b70b03657bbb92f4b73e6e0c807669dae10
# Parent 211188885b0000b034eb168806d485b3b28c3112
# Available At http://hg.logilab.org/users/dlaxalde/hg
# hg pull http://hg.logilab.org/users/dlaxalde/hg -r ae007b70b036
# EXP-Topic pull-info-transaction
transaction-summary: display the range of new revisions upon pull/unbundle
Upon pull or unbundle, we display a message with the range of new revisions
fetched. This revision range could readily be used after a pull to look out
what's new with 'hg log'. The algorithm takes care of filtering "obsolete"
revisions that might be present in transaction's "changes" but should not be
displayed to the end user.
diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -1125,6 +1125,11 @@ class simplekeyvaluefile(object):
'unbundle',
]
+_reportnewcssource = [
+ 'pull',
+ 'unbundle',
+]
+
def registersummarycallback(repo, otr, txnname=''):
"""register a callback to issue a summary after the transaction is closed
"""
@@ -1151,3 +1156,34 @@ def registersummarycallback(repo, otr, t
if obsoleted:
repo.ui.status(_('obsoleted %i changesets\n')
% len(obsoleted))
+
+ if txmatch(_reportnewcssource):
+ @reportsummary
+ def reportnewcs(repo, tr):
+ """Report the range of new revisions pulled/unbundled."""
+ newrevs = list(tr.changes.get('revs', set()))
+ if not newrevs:
+ return
+
+ # Compute the bounds of new revisions' range, excluding obsoletes.
+ unfi = repo.unfiltered()
+ minrev, maxrev = None, None
+ newrevs.sort()
+ for r in newrevs:
+ if not unfi[r].obsolete():
+ minrev = repo[r]
+ break
+ for r in reversed(newrevs):
+ if not unfi[r].obsolete():
+ maxrev = repo[r]
+ break
+
+ if minrev is None or maxrev is None:
+ # Got only obsoletes.
+ return
+
+ if minrev == maxrev:
+ revrange = minrev
+ else:
+ revrange = '%s:%s' % (minrev, maxrev)
+ repo.ui.status(_('new changesets %s\n') % revrange)
diff --git a/tests/test-acl.t b/tests/test-acl.t
--- a/tests/test-acl.t
+++ b/tests/test-acl.t
@@ -67,6 +67,7 @@
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
+ new changesets 6675d58eff77
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1416,6 +1417,7 @@ Branch acl tests setup
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 81fbf4469322:fb35475503ef
(run 'hg heads' to see heads)
Create additional changeset on foobar branch
diff --git a/tests/test-audit-path.t b/tests/test-audit-path.t
--- a/tests/test-audit-path.t
+++ b/tests/test-audit-path.t
@@ -78,6 +78,7 @@ unbundle tampered bundle
adding manifests
adding file changes
added 5 changesets with 6 changes to 6 files (+4 heads)
+ new changesets b7da9bf6b037:fc1393d727bc
(run 'hg heads' to see heads, 'hg merge' to merge)
attack .hg/test
diff --git a/tests/test-blackbox.t b/tests/test-blackbox.t
--- a/tests/test-blackbox.t
+++ b/tests/test-blackbox.t
@@ -66,6 +66,7 @@ clone, commit, pull
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets d02f48003e62
(run 'hg update' to get a working copy)
$ hg blackbox -l 6
1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pull
@@ -109,6 +110,7 @@ we must not cause a failure if we cannot
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets d02f48003e62
(run 'hg update' to get a working copy)
a failure reading from the log is fatal
diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t
+++ b/tests/test-bookmarks-pushpull.t
@@ -40,6 +40,7 @@ import bookmark by name
adding remote bookmark X
updating bookmark Y
adding remote bookmark Z
+ new changesets 4e3505fd9583
(run 'hg update' to get a working copy)
$ hg bookmarks
X 0:4e3505fd9583
@@ -190,6 +191,7 @@ divergent bookmarks
divergent bookmark @ stored as @foo
divergent bookmark X stored as X at foo
updating bookmark Z
+ new changesets 0d2164f0ce0d
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg book
@ 1:9b140be10808
@@ -343,6 +345,7 @@ race conditions
adding file changes
added 1 changesets with 1 changes to 1 files
updating bookmark Y
+ new changesets b0a5eff05604
(run 'hg update' to get a working copy)
$ hg book
* @ 1:0d2164f0ce0d
@@ -392,6 +395,7 @@ Update a bookmark right after the initia
adding file changes
added 1 changesets with 1 changes to 1 files
updating bookmark Y
+ new changesets 35d1ef0a8d1b
(run 'hg update' to get a working copy)
$ hg book
@ 1:0d2164f0ce0d
@@ -555,6 +559,7 @@ hgweb
adding file changes
added 5 changesets with 5 changes to 3 files (+2 heads)
2 new obsolescence markers
+ new changesets 4e3505fd9583:c922c0139ca0
updating to bookmark @
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R cloned-bookmarks bookmarks
@@ -691,6 +696,7 @@ bookmark, not all outgoing changes:
adding file changes
added 5 changesets with 5 changes to 3 files (+2 heads)
2 new obsolescence markers
+ new changesets 4e3505fd9583:c922c0139ca0
updating to bookmark @
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd addmarks
diff --git a/tests/test-bookmarks.t b/tests/test-bookmarks.t
--- a/tests/test-bookmarks.t
+++ b/tests/test-bookmarks.t
@@ -550,6 +550,7 @@ test clone with pull protocol
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads)
+ new changesets f7b1eb17ad24:db815d6d32e6
updating to bookmark @
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R cloned-bookmarks-pull bookmarks
@@ -587,6 +588,7 @@ test clone with a specific revision
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets f7b1eb17ad24:925d80f479bb
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R cloned-bookmarks-rev bookmarks
@@ -627,6 +629,7 @@ create bundle with two heads
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
+ new changesets 125c9a1d6df6:9ba5f110a0b3
(run 'hg heads' to see heads, 'hg merge' to merge)
update to active bookmark if it's not the parent
@@ -674,6 +677,7 @@ pull --update works the same as pull &&
added 2 changesets with 2 changes to 2 files (+1 heads)
updating bookmark Y
updating bookmark Z
+ new changesets 125c9a1d6df6:9ba5f110a0b3
(run 'hg heads' to see heads, 'hg merge' to merge)
(# tests strange but with --date crashing when bookmark have to move)
@@ -699,6 +703,7 @@ pull --update works the same as pull &&
added 2 changesets with 2 changes to 2 files (+1 heads)
updating bookmark Y
updating bookmark Z
+ new changesets 125c9a1d6df6:9ba5f110a0b3
updating to active bookmark Y
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -723,6 +728,7 @@ We warn about divergent during bare upda
added 2 changesets with 2 changes to 2 files (+1 heads)
updating bookmark Y
updating bookmark Z
+ new changesets 125c9a1d6df6:9ba5f110a0b3
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R ../cloned-bookmarks-manual-update-with-divergence update
updating to active bookmark Y
@@ -907,6 +913,7 @@ case)
adding remote bookmark foo
adding remote bookmark four
adding remote bookmark should-end-on-two
+ new changesets 5fb12f0f2d51
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n"
3:125c9a1d6df6
@@ -930,6 +937,7 @@ updates the working directory and curren
adding file changes
added 1 changesets with 1 changes to 1 files
divergent bookmark Z stored as Z at default
+ new changesets 81dcce76aa0b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updating bookmark Y
$ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n"
diff --git a/tests/test-branch-option.t b/tests/test-branch-option.t
--- a/tests/test-branch-option.t
+++ b/tests/test-branch-option.t
@@ -23,6 +23,7 @@ test branch selection options
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 5b65ba7c951d
updating to branch a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd branch2
@@ -101,6 +102,7 @@ clone branch b
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files (+1 heads)
+ new changesets 5b65ba7c951d:65511d0e2b55
updating to branch b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -q -R branch3 heads b
@@ -117,6 +119,7 @@ clone rev a branch b
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files (+1 heads)
+ new changesets 5b65ba7c951d:65511d0e2b55
updating to branch a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -q -R branch3 heads b
diff --git a/tests/test-branches.t b/tests/test-branches.t
--- a/tests/test-branches.t
+++ b/tests/test-branches.t
@@ -93,6 +93,7 @@ verify update will accept invalid legacy
adding manifests
adding file changes
added 3 changesets with 3 changes to 2 files
+ new changesets f0e4c7f04036:33c2ceb9310b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg update '"colon:test"'
diff --git a/tests/test-bundle-r.t b/tests/test-bundle-r.t
--- a/tests/test-bundle-r.t
+++ b/tests/test-bundle-r.t
@@ -5,6 +5,7 @@
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
+ new changesets bfaf4b5cbf01:916f1afdef90
(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
@@ -26,6 +27,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets bfaf4b5cbf01
(run 'hg update' to get a working copy)
checking changesets
checking manifests
@@ -39,6 +41,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets bfaf4b5cbf01:21f32785131f
(run 'hg update' to get a working copy)
checking changesets
checking manifests
@@ -52,6 +55,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
+ new changesets bfaf4b5cbf01:4ce51a113780
(run 'hg update' to get a working copy)
checking changesets
checking manifests
@@ -65,6 +69,7 @@
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
+ new changesets bfaf4b5cbf01:93ee6ab32777
(run 'hg update' to get a working copy)
checking changesets
checking manifests
@@ -78,6 +83,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets bfaf4b5cbf01:c70afb1ee985
(run 'hg update' to get a working copy)
checking changesets
checking manifests
@@ -91,6 +97,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
+ new changesets bfaf4b5cbf01:f03ae5a9b979
(run 'hg update' to get a working copy)
checking changesets
checking manifests
@@ -104,6 +111,7 @@
adding manifests
adding file changes
added 4 changesets with 5 changes to 2 files
+ new changesets bfaf4b5cbf01:095cb14b1b4d
(run 'hg update' to get a working copy)
checking changesets
checking manifests
@@ -117,6 +125,7 @@
adding manifests
adding file changes
added 5 changesets with 6 changes to 3 files
+ new changesets bfaf4b5cbf01:faa2e4234c7a
(run 'hg update' to get a working copy)
checking changesets
checking manifests
@@ -130,6 +139,7 @@
adding manifests
adding file changes
added 5 changesets with 5 changes to 2 files
+ new changesets bfaf4b5cbf01:916f1afdef90
(run 'hg update' to get a working copy)
checking changesets
checking manifests
@@ -145,6 +155,7 @@
adding manifests
adding file changes
added 4 changesets with 2 changes to 3 files (+1 heads)
+ new changesets c70afb1ee985:faa2e4234c7a
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg verify
checking changesets
@@ -223,6 +234,7 @@ revision 2
adding manifests
adding file changes
added 6 changesets with 4 changes to 4 files (+1 heads)
+ new changesets 93ee6ab32777:916f1afdef90
(run 'hg heads' to see heads, 'hg merge' to merge)
revision 8
@@ -247,6 +259,7 @@ revision 2
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets 93ee6ab32777:916f1afdef90
(run 'hg update' to get a working copy)
revision 4
@@ -266,6 +279,7 @@ revision 4
adding manifests
adding file changes
added 4 changesets with 3 changes to 3 files (+1 heads)
+ new changesets c70afb1ee985:faa2e4234c7a
(run 'hg heads' to see heads, 'hg merge' to merge)
revision 6
@@ -285,6 +299,7 @@ revision 6
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets 93ee6ab32777:916f1afdef90
(run 'hg update' to get a working copy)
revision 4
@@ -318,6 +333,7 @@ revision 4
adding manifests
adding file changes
added 7 changesets with 4 changes to 4 files
+ new changesets 93ee6ab32777:03fc0b0e347c
(run 'hg update' to get a working copy)
revision 9
diff --git a/tests/test-bundle-type.t b/tests/test-bundle-type.t
--- a/tests/test-bundle-type.t
+++ b/tests/test-bundle-type.t
@@ -26,6 +26,7 @@ bundle w/o type option
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets c35a0f9217e6
(run 'hg update' to get a working copy)
$ hg up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-bundle-vs-outgoing.t b/tests/test-bundle-vs-outgoing.t
--- a/tests/test-bundle-vs-outgoing.t
+++ b/tests/test-bundle-vs-outgoing.t
@@ -106,6 +106,7 @@ sanity check of outgoing: expect revs 4
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
+ new changesets 6ae4cca4e39a:478f191e53f8
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-bundle.t b/tests/test-bundle.t
--- a/tests/test-bundle.t
+++ b/tests/test-bundle.t
@@ -104,6 +104,7 @@ Pull full.hg into empty (using --cwd)
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
+ new changesets f9ee2f85a263:aa35859c02ea
(run 'hg heads' to see heads, 'hg merge' to merge)
Rollback empty
@@ -120,6 +121,7 @@ Pull full.hg into empty again (using --c
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
+ new changesets f9ee2f85a263:aa35859c02ea
(run 'hg heads' to see heads, 'hg merge' to merge)
Pull full.hg into test (using -R)
@@ -150,6 +152,7 @@ Pull full.hg into empty again (using -R)
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
+ new changesets f9ee2f85a263:aa35859c02ea
(run 'hg heads' to see heads, 'hg merge' to merge)
Log -R full.hg in fresh empty
@@ -232,6 +235,7 @@ hg -R bundle://../full.hg verify
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
+ new changesets f9ee2f85a263:aa35859c02ea
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,6 +259,7 @@ Pull full.hg into empty again (using -R;
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
+ new changesets f9ee2f85a263:aa35859c02ea
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)
@@ -387,6 +392,7 @@ Create partial clones
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
+ new changesets f9ee2f85a263:eebf5a27f8ca
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg clone partial partial2
@@ -541,6 +547,7 @@ Direct clone from bundle (all-history)
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
+ new changesets f9ee2f85a263:aa35859c02ea
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R full-clone heads
@@ -580,10 +587,12 @@ Unbundle incremental bundles into fresh
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets f9ee2f85a263
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 34c2bf6b0626
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
View full contents of the bundle
diff --git a/tests/test-bundle2-exchange.t b/tests/test-bundle2-exchange.t
--- a/tests/test-bundle2-exchange.t
+++ b/tests/test-bundle2-exchange.t
@@ -49,6 +49,7 @@ The extension requires a repo (currently
adding file changes
added 8 changesets with 7 changes to 7 files (+3 heads)
pre-close-tip:02de42196ebe draft
+ new changesets cd010b8cd998:02de42196ebe
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)
@@ -83,6 +84,7 @@ clone --pull
added 2 changesets with 2 changes to 2 files
1 new obsolescence markers
pre-close-tip:9520eea781bc draft
+ new changesets cd010b8cd998:9520eea781bc
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)
@@ -111,6 +113,7 @@ pull
added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers
pre-close-tip:24b6387c8c8c draft
+ new changesets 24b6387c8c8c
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)
@@ -288,6 +291,7 @@ pull over ssh
1 new obsolescence markers
updating bookmark book_02de
pre-close-tip:02de42196ebe draft book_02de
+ new changesets 02de42196ebe
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
@@ -313,6 +317,7 @@ pull over http
1 new obsolescence markers
updating bookmark book_42cc
pre-close-tip:42ccdea3bb16 draft book_42cc
+ new changesets 42ccdea3bb16
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/
@@ -998,6 +1003,7 @@ bundle1 can still pull non-generaldelta
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 96ee1d7354c4
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1079,6 +1085,7 @@ Verify the global server.bundle1 option
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 96ee1d7354c4
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1105,6 +1112,7 @@ Verify bundle1 pushes can be disabled
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 96ee1d7354c4
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd bundle2-only
diff --git a/tests/test-bundle2-format.t b/tests/test-bundle2-format.t
--- a/tests/test-bundle2-format.t
+++ b/tests/test-bundle2-format.t
@@ -835,6 +835,7 @@ Support for changegroup
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+3 heads)
+ new changesets cd010b8cd998:02de42196ebe
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg log -G
diff --git a/tests/test-bundle2-multiple-changegroups.t b/tests/test-bundle2-multiple-changegroups.t
--- a/tests/test-bundle2-multiple-changegroups.t
+++ b/tests/test-bundle2-multiple-changegroups.t
@@ -88,6 +88,7 @@ Pull the new commits in the clone
adding file changes
added 1 changesets with 1 changes to 1 files
pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
+ new changesets 27547f69f254:f838bfaca5c7
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
@@ -158,6 +159,7 @@ pullop.cgresult
adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads)
pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
+ new changesets b3325c91a4d9:5cd59d311f65
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
@@ -231,6 +233,7 @@ pullop.cgresult
adding file changes
added 1 changesets with 1 changes to 1 files
pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
+ new changesets 71bd7b46de72:9d18e5bd9ab0
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo
diff --git a/tests/test-bundle2-remote-changegroup.t b/tests/test-bundle2-remote-changegroup.t
--- a/tests/test-bundle2-remote-changegroup.t
+++ b/tests/test-bundle2-remote-changegroup.t
@@ -91,6 +91,7 @@ Start a simple HTTP server to serve bund
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
+ new changesets cd010b8cd998:02de42196ebe
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R repo log -G
@@ -131,6 +132,7 @@ Test a pull with an remote-changegroup
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files (+1 heads)
+ new changesets cd010b8cd998:9520eea781bc
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg pull -R clone ssh://user@dummy/repo
@@ -141,6 +143,7 @@ Test a pull with an remote-changegroup
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files (+1 heads)
+ new changesets 24b6387c8c8c:02de42196ebe
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R clone log -G
o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits at gmail.com> H
@@ -174,6 +177,7 @@ Test a pull with an remote-changegroup a
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
+ new changesets cd010b8cd998:5fddd98957c8
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg pull -R clone ssh://user@dummy/repo
@@ -189,6 +193,7 @@ Test a pull with an remote-changegroup a
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files (+1 heads)
+ new changesets 32af7686d403:02de42196ebe
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R clone log -G
o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits at gmail.com> H
@@ -222,6 +227,7 @@ Test a pull with a changegroup followed
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
+ new changesets cd010b8cd998:5fddd98957c8
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg pull -R clone ssh://user@dummy/repo
@@ -237,6 +243,7 @@ Test a pull with a changegroup followed
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files (+1 heads)
+ new changesets 32af7686d403:02de42196ebe
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R clone log -G
o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits at gmail.com> H
@@ -273,6 +280,7 @@ Test a pull with two remote-changegroups
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
+ new changesets cd010b8cd998:5fddd98957c8
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg pull -R clone ssh://user@dummy/repo
@@ -293,6 +301,7 @@ Test a pull with two remote-changegroups
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 32af7686d403:02de42196ebe
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R clone log -G
o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits at gmail.com> H
@@ -328,6 +337,7 @@ Hash digest tests
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
+ new changesets cd010b8cd998:02de42196ebe
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf clone
@@ -342,6 +352,7 @@ Hash digest tests
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
+ new changesets cd010b8cd998:02de42196ebe
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf clone
@@ -376,6 +387,7 @@ Multiple hash digests can be given
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
+ new changesets cd010b8cd998:02de42196ebe
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf clone
@@ -421,6 +433,7 @@ Corruption tests
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
+ new changesets cd010b8cd998:5fddd98957c8
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-censor.t b/tests/test-censor.t
--- a/tests/test-censor.t
+++ b/tests/test-censor.t
@@ -359,6 +359,7 @@ Repo cloned before tainted content intro
adding manifests
adding file changes
added 11 changesets with 11 changes to 2 files (+1 heads)
+ new changesets 186fb27560c3:683e4645fded
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg update 4
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -423,6 +424,7 @@ Censored nodes can be bundled up and unb
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
+ new changesets 075be80ac777:dcbaf17bf3a1
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg cat -r $REV target
$ hg cat -r $CLEANREV target
@@ -450,12 +452,14 @@ Censored nodes can be imported on top of
adding manifests
adding file changes
added 8 changesets with 10 changes to 2 files (+1 heads)
+ new changesets e97f55b2665a:dcbaf17bf3a1
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg unbundle splitbundle
adding changesets
adding manifests
adding file changes
added 6 changesets with 5 changes to 2 files (+1 heads)
+ new changesets efbe78065929:683e4645fded
(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
@@ -481,5 +485,6 @@ Can import bundle where first revision o
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets e97f55b2665a
(run 'hg update' to get a working copy)
$ hg cat -r 0 target
diff --git a/tests/test-clone-pull-corruption.t b/tests/test-clone-pull-corruption.t
--- a/tests/test-clone-pull-corruption.t
+++ b/tests/test-clone-pull-corruption.t
@@ -37,6 +37,7 @@ start a commit...
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 52998019f625
(run 'hg update' to get a working copy)
see what happened
diff --git a/tests/test-clone-r.t b/tests/test-clone-r.t
--- a/tests/test-clone-r.t
+++ b/tests/test-clone-r.t
@@ -89,6 +89,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets f9ee2f85a263
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -102,6 +103,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets f9ee2f85a263:34c2bf6b0626
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -115,6 +117,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
+ new changesets f9ee2f85a263:e38ba6f5b7e0
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -128,6 +131,7 @@
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
+ new changesets f9ee2f85a263:eebf5a27f8ca
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -141,6 +145,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets f9ee2f85a263:095197eb4973
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -154,6 +159,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
+ new changesets f9ee2f85a263:1bb50a9436a7
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -167,6 +173,7 @@
adding manifests
adding file changes
added 4 changesets with 5 changes to 2 files
+ new changesets f9ee2f85a263:7373c1169842
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -180,6 +187,7 @@
adding manifests
adding file changes
added 5 changesets with 6 changes to 3 files
+ new changesets f9ee2f85a263:a6a34bfa0076
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -193,6 +201,7 @@
adding manifests
adding file changes
added 5 changesets with 5 changes to 2 files
+ new changesets f9ee2f85a263:aa35859c02ea
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -209,6 +218,7 @@
adding manifests
adding file changes
added 4 changesets with 2 changes to 3 files (+1 heads)
+ new changesets 095197eb4973:a6a34bfa0076
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg verify
checking changesets
@@ -237,6 +247,7 @@
adding manifests
adding file changes
added 6 changesets with 6 changes to 3 files
+ new changesets f9ee2f85a263:7100abb79635
updating to branch foobar
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-clone-uncompressed.t b/tests/test-clone-uncompressed.t
--- a/tests/test-clone-uncompressed.t
+++ b/tests/test-clone-uncompressed.t
@@ -68,6 +68,7 @@ Cannot stream clone when there are secre
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 96ee1d7354c4
$ killdaemons.py
@@ -100,6 +101,7 @@ Verify interaction between preferuncompr
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 96ee1d7354c4
$ killdaemons.py
@@ -129,6 +131,7 @@ there is no security so it isn't importa
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 96ee1d7354c4
Stream clone while repo is changing:
diff --git a/tests/test-clone-update-order.t b/tests/test-clone-update-order.t
--- a/tests/test-clone-update-order.t
+++ b/tests/test-clone-update-order.t
@@ -29,6 +29,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
+ new changesets 8c68ee086fd0:fcc393352796
$ rm -rf ../b
$ hg clone -u . .#other ../b -r 0 -r 1 -r 2 -b other
@@ -36,6 +37,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
+ new changesets 8c68ee086fd0:fcc393352796
updating to branch mine
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b
@@ -45,6 +47,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
+ new changesets 8c68ee086fd0:fcc393352796
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b
@@ -54,6 +57,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
+ new changesets 8c68ee086fd0:fcc393352796
updating to branch mine
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b
@@ -63,6 +67,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
+ new changesets 8c68ee086fd0:fcc393352796
updating to branch other
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b
@@ -74,6 +79,7 @@ Test -r mine ... mine is ignored:
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
+ new changesets 8c68ee086fd0:fcc393352796
updating to branch other
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b
@@ -83,6 +89,7 @@ Test -r mine ... mine is ignored:
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
+ new changesets 8c68ee086fd0:fcc393352796
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b
@@ -92,6 +99,7 @@ Test -r mine ... mine is ignored:
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets fcc393352796
updating to branch other
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b
diff --git a/tests/test-clone.t b/tests/test-clone.t
--- a/tests/test-clone.t
+++ b/tests/test-clone.t
@@ -148,6 +148,7 @@ Use --pull:
adding manifests
adding file changes
added 11 changesets with 11 changes to 2 files
+ new changesets acb14030fe0a:a7949464abda
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R g verify
@@ -269,6 +270,7 @@ Testing clone --pull -u:
adding manifests
adding file changes
added 16 changesets with 16 changes to 3 files (+1 heads)
+ new changesets acb14030fe0a:0aae7cf88f0d
updating to branch stable
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -409,6 +411,7 @@ Testing #<branch>:
adding manifests
adding file changes
added 14 changesets with 14 changes to 3 files
+ new changesets acb14030fe0a:0aae7cf88f0d
updating to branch stable
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -445,6 +448,7 @@ Testing -u -r <branch>:
adding manifests
adding file changes
added 14 changesets with 14 changes to 3 files
+ new changesets acb14030fe0a:0aae7cf88f0d
updating to branch stable
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -481,6 +485,7 @@ Testing -r <branch>:
adding manifests
adding file changes
added 14 changesets with 14 changes to 3 files
+ new changesets acb14030fe0a:0aae7cf88f0d
updating to branch stable
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -543,6 +548,7 @@ iterable in addbranchrevs()
adding manifests
adding file changes
added 14 changesets with 14 changes to 3 files
+ new changesets acb14030fe0a:0aae7cf88f0d
updating to branch stable
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -r ua
@@ -774,6 +780,7 @@ Clone with auto share from a repo with f
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets e082c1832e09
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -786,6 +793,7 @@ Clone from repo with content should resu
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
+ new changesets b5f04eac9d8f:e5bfe23c0b47
searching for changes
no changes found
adding remote bookmark bookA
@@ -823,6 +831,7 @@ Clone with existing share dir should res
added 4 changesets with 4 changes to 1 files (+4 heads)
adding remote bookmark head1
adding remote bookmark head2
+ new changesets 4a8dc1ab4c13:6bacf4683960
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -863,6 +872,7 @@ Clone from unrelated repo should result
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets 22aeff664783:63cf6c3dba4a
searching for changes
no changes found
updating working directory
@@ -881,6 +891,7 @@ remote naming mode works as advertised
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
+ new changesets b5f04eac9d8f:e5bfe23c0b47
searching for changes
no changes found
adding remote bookmark bookA
@@ -897,6 +908,7 @@ remote naming mode works as advertised
adding manifests
adding file changes
added 6 changesets with 6 changes to 1 files (+4 heads)
+ new changesets b5f04eac9d8f:6bacf4683960
searching for changes
no changes found
adding remote bookmark head1
@@ -916,6 +928,7 @@ request to clone a single revision is re
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets b5f04eac9d8f:4a8dc1ab4c13
no changes found
adding remote bookmark head1
updating working directory
@@ -946,6 +959,7 @@ making another clone should only pull do
added 1 changesets with 1 changes to 1 files (+1 heads)
adding remote bookmark head1
adding remote bookmark head2
+ new changesets 99f71071f117
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -978,6 +992,7 @@ Request to clone a single branch is resp
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets b5f04eac9d8f:5f92a6c1a1b1
no changes found
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1003,6 +1018,7 @@ Request to clone a single branch is resp
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 6bacf4683960
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1084,6 +1100,7 @@ pooled".
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
+ new changesets b5f04eac9d8f:e5bfe23c0b47
searching for changes
no changes found
adding remote bookmark bookA
diff --git a/tests/test-clonebundles.t b/tests/test-clonebundles.t
--- a/tests/test-clonebundles.t
+++ b/tests/test-clonebundles.t
@@ -28,6 +28,7 @@ Missing manifest should not result in se
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets 53245c60e682:aaff8d2ffbbf
$ cat server/access.log
* - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
@@ -45,6 +46,7 @@ Empty manifest file results in retrieval
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets 53245c60e682:aaff8d2ffbbf
Manifest file with invalid URL aborts
@@ -89,6 +91,7 @@ We can override failure to fall back to
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets 53245c60e682:aaff8d2ffbbf
Bundle with partial content works
@@ -127,6 +130,7 @@ changes. If this output changes, we coul
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets aaff8d2ffbbf
Incremental pull doesn't fetch bundle
@@ -135,6 +139,7 @@ Incremental pull doesn't fetch bundle
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 53245c60e682
$ cd partial-clone
$ hg pull
@@ -144,6 +149,7 @@ Incremental pull doesn't fetch bundle
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets aaff8d2ffbbf
(run 'hg update' to get a working copy)
$ cd ..
@@ -240,6 +246,7 @@ Automatic fallback when all entries are
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets 53245c60e682:aaff8d2ffbbf
URLs requiring SNI are filtered in Python <2.7.9
@@ -337,6 +344,7 @@ Stream bundle spec with unknown requirem
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets 53245c60e682:aaff8d2ffbbf
Set up manifest for testing preferences
(Remember, the TYPE does not have to match reality - the URL is
diff --git a/tests/test-contrib.t b/tests/test-contrib.t
--- a/tests/test-contrib.t
+++ b/tests/test-contrib.t
@@ -79,6 +79,7 @@ Rebuild fncache with clone --pull:
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
+ new changesets de1da620e7d8:46946d278c50
Verify:
diff --git a/tests/test-empty-group.t b/tests/test-empty-group.t
--- a/tests/test-empty-group.t
+++ b/tests/test-empty-group.t
@@ -53,6 +53,7 @@
adding manifests
adding file changes
added 4 changesets with 3 changes to 3 files
+ new changesets 5fcb73622933:d15a0c284984
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -61,6 +62,7 @@
adding manifests
adding file changes
added 4 changesets with 3 changes to 3 files
+ new changesets 5fcb73622933:1ec3c74fc0e0
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -115,6 +117,7 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
+ new changesets 1ec3c74fc0e0
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R c pull a
@@ -124,4 +127,5 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
+ new changesets d15a0c284984
(run 'hg heads' to see heads, 'hg merge' to merge)
diff --git a/tests/test-encoding.t b/tests/test-encoding.t
--- a/tests/test-encoding.t
+++ b/tests/test-encoding.t
@@ -10,6 +10,7 @@ we need a repo with some legacy latin-1
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets 1e78a93102a3:0e5b7e3f9c4a
(run 'hg update' to get a working copy)
$ hg co
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-eol-clone.t b/tests/test-eol-clone.t
--- a/tests/test-eol-clone.t
+++ b/tests/test-eol-clone.t
@@ -61,6 +61,7 @@ Test clone of revision with .hgeol
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 90f94e2cf4e2
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo-4
diff --git a/tests/test-exchange-obsmarkers-case-A1.t b/tests/test-exchange-obsmarkers-case-A1.t
--- a/tests/test-exchange-obsmarkers-case-A1.t
+++ b/tests/test-exchange-obsmarkers-case-A1.t
@@ -103,6 +103,7 @@ Variant a: push -r A
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
+ new changesets f5bc6836db60
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
@@ -144,6 +145,7 @@ Variant b: push
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
+ new changesets f5bc6836db60
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
@@ -244,6 +246,7 @@ Variant a: push -r A
adding file changes
added 2 changesets with 2 changes to 2 files
1 new obsolescence markers
+ new changesets f5bc6836db60:f6fbb35d8ac9
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
@@ -285,6 +288,7 @@ Variant b: push
adding file changes
added 2 changesets with 2 changes to 2 files
1 new obsolescence markers
+ new changesets f5bc6836db60:f6fbb35d8ac9
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
diff --git a/tests/test-exchange-obsmarkers-case-A2.t b/tests/test-exchange-obsmarkers-case-A2.t
--- a/tests/test-exchange-obsmarkers-case-A2.t
+++ b/tests/test-exchange-obsmarkers-case-A2.t
@@ -111,6 +111,7 @@ Actual Test
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
+ new changesets f5bc6836db60
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
diff --git a/tests/test-exchange-obsmarkers-case-A3.t b/tests/test-exchange-obsmarkers-case-A3.t
--- a/tests/test-exchange-obsmarkers-case-A3.t
+++ b/tests/test-exchange-obsmarkers-case-A3.t
@@ -130,6 +130,7 @@ Actual Test for first version (changeset
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
+ new changesets e5ea8f9c7314
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
@@ -233,6 +234,7 @@ test obsmarkers exchange.
added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers
obsoleted 1 changesets
+ new changesets e5ea8f9c7314
(run 'hg heads' to see heads, 'hg merge' to merge)
## post pull state
# obstore: main
diff --git a/tests/test-exchange-obsmarkers-case-A4.t b/tests/test-exchange-obsmarkers-case-A4.t
--- a/tests/test-exchange-obsmarkers-case-A4.t
+++ b/tests/test-exchange-obsmarkers-case-A4.t
@@ -117,6 +117,7 @@ Actual Test for first version
adding file changes
added 2 changesets with 2 changes to 2 files
1 new obsolescence markers
+ new changesets 28b51eb45704:06055a7959d4
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
diff --git a/tests/test-exchange-obsmarkers-case-A5.t b/tests/test-exchange-obsmarkers-case-A5.t
--- a/tests/test-exchange-obsmarkers-case-A5.t
+++ b/tests/test-exchange-obsmarkers-case-A5.t
@@ -126,6 +126,7 @@ Actual Test
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
+ new changesets f6298a8ac3a4
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
diff --git a/tests/test-exchange-obsmarkers-case-B3.t b/tests/test-exchange-obsmarkers-case-B3.t
--- a/tests/test-exchange-obsmarkers-case-B3.t
+++ b/tests/test-exchange-obsmarkers-case-B3.t
@@ -106,6 +106,7 @@ Actual Test
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets f5bc6836db60
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
diff --git a/tests/test-exchange-obsmarkers-case-B5.t b/tests/test-exchange-obsmarkers-case-B5.t
--- a/tests/test-exchange-obsmarkers-case-B5.t
+++ b/tests/test-exchange-obsmarkers-case-B5.t
@@ -137,6 +137,7 @@ Actual Test (explicit push version)
adding file changes
added 3 changesets with 3 changes to 3 files
1 new obsolescence markers
+ new changesets 28b51eb45704:1d0f3cd25300
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
diff --git a/tests/test-exchange-obsmarkers-case-C2.t b/tests/test-exchange-obsmarkers-case-C2.t
--- a/tests/test-exchange-obsmarkers-case-C2.t
+++ b/tests/test-exchange-obsmarkers-case-C2.t
@@ -119,6 +119,7 @@ Actual Test (explicit push)
adding file changes
added 1 changesets with 1 changes to 1 files
2 new obsolescence markers
+ new changesets e5ea8f9c7314
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
@@ -166,6 +167,7 @@ Actual Test (bare push)
adding file changes
added 1 changesets with 1 changes to 1 files
2 new obsolescence markers
+ new changesets e5ea8f9c7314
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
diff --git a/tests/test-exchange-obsmarkers-case-D1.t b/tests/test-exchange-obsmarkers-case-D1.t
--- a/tests/test-exchange-obsmarkers-case-D1.t
+++ b/tests/test-exchange-obsmarkers-case-D1.t
@@ -117,6 +117,7 @@ Actual Test (explicit push)
adding file changes
added 1 changesets with 1 changes to 1 files
2 new obsolescence markers
+ new changesets e5ea8f9c7314
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
@@ -164,6 +165,7 @@ Actual Test (base push)
adding file changes
added 1 changesets with 1 changes to 1 files
2 new obsolescence markers
+ new changesets e5ea8f9c7314
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
diff --git a/tests/test-exchange-obsmarkers-case-D4.t b/tests/test-exchange-obsmarkers-case-D4.t
--- a/tests/test-exchange-obsmarkers-case-D4.t
+++ b/tests/test-exchange-obsmarkers-case-D4.t
@@ -125,6 +125,7 @@ Actual Test
adding file changes
added 1 changesets with 1 changes to 1 files
2 new obsolescence markers
+ new changesets e5ea8f9c7314
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
diff --git a/tests/test-fetch.t b/tests/test-fetch.t
--- a/tests/test-fetch.t
+++ b/tests/test-fetch.t
@@ -30,6 +30,7 @@ should pull one change
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets d2ae7f538514
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg --cwd b parents -q
1:d2ae7f538514
@@ -55,6 +56,7 @@ should merge c into a
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets d2ae7f538514
updating to 2:d2ae7f538514
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging with 1:d36c0562f908
@@ -77,6 +79,7 @@ fetch over http, no auth
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets d2ae7f538514
updating to 2:d2ae7f538514
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging with 1:d36c0562f908
@@ -110,6 +113,7 @@ specified, even though commit message is
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets d2ae7f538514
updating to 2:d2ae7f538514
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging with 1:d36c0562f908
@@ -141,6 +145,7 @@ should merge f into g
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 6343ca3eff20
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging with 3:6343ca3eff20
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -193,6 +198,7 @@ pull in change on foreign branch
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 8fdc9284bbc5
parent should be 2 (no automatic update)
@@ -225,6 +231,7 @@ pull in changes on both foreign and loca
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets 8fdc9284bbc5:3c4a837a864f
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent should be 4 (fast forward)
@@ -267,6 +274,7 @@ with a local change
adding manifests
adding file changes
added 3 changesets with 3 changes to 2 files (+2 heads)
+ new changesets d05ce59ff88d:a7954de24e4c
updating to 5:3c4a837a864f
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging with 3:1267f84a9ea5
@@ -314,6 +322,7 @@ heads) with a local change
adding manifests
adding file changes
added 3 changesets with 2 changes to 1 files (+2 heads)
+ new changesets b84e8d0f020f:3d3bf54f99c0
not merging with 1 other new branch heads (use "hg heads ." and "hg merge" to merge them)
[1]
@@ -398,6 +407,7 @@ test issue1726
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 7837755a2789
updating to 2:7837755a2789
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging with 1:d1f0c6c48ebd
@@ -426,5 +436,6 @@ test issue2047
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets c8735224de5c
$ cd ..
diff --git a/tests/test-filebranch.t b/tests/test-filebranch.t
--- a/tests/test-filebranch.t
+++ b/tests/test-filebranch.t
@@ -53,6 +53,7 @@ Merging:
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files (+1 heads)
+ new changesets bdd988058d16
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg merge -v
diff --git a/tests/test-flagprocessor.t b/tests/test-flagprocessor.t
--- a/tests/test-flagprocessor.t
+++ b/tests/test-flagprocessor.t
@@ -107,6 +107,7 @@
adding manifests
adding file changes
added 7 changesets with 7 changes to 7 files
+ new changesets 07b1b9442c5b:6e48f4215d24
(run 'hg update' to get a working copy)
$ hg update
7 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-flags.t b/tests/test-flags.t
--- a/tests/test-flags.t
+++ b/tests/test-flags.t
@@ -22,6 +22,7 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 22a449e20da5
(run 'hg update' to get a working copy)
$ hg co
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -44,6 +45,7 @@ the changelog should mention file a:
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
+ new changesets 7f4313b42a34
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg heads
changeset: 2:7f4313b42a34
@@ -96,6 +98,7 @@ the changelog should mention file a:
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
+ new changesets 7f4313b42a34
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg heads
changeset: 2:7f4313b42a34
diff --git a/tests/test-generaldelta.t b/tests/test-generaldelta.t
--- a/tests/test-generaldelta.t
+++ b/tests/test-generaldelta.t
@@ -85,6 +85,7 @@ delta coming from the server base delta
adding manifests
adding file changes
added 4 changesets with 6 changes to 3 files (+2 heads)
+ new changesets 0ea3fcf9d01d:bba78d330d9c
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg clone repo --pull --config format.generaldelta=1 full
@@ -93,6 +94,7 @@ delta coming from the server base delta
adding manifests
adding file changes
added 4 changesets with 6 changes to 3 files (+2 heads)
+ new changesets 0ea3fcf9d01d:bba78d330d9c
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R repo debugindex -m
@@ -229,6 +231,7 @@ test maxdeltachainspan
adding manifests
adding file changes
added 53 changesets with 53 changes to 53 files (+2 heads)
+ new changesets 61246295ee1e:99cae3713489
updating to branch default
14 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R relax-chain debugindex -m
@@ -292,6 +295,7 @@ test maxdeltachainspan
adding manifests
adding file changes
added 53 changesets with 53 changes to 53 files (+2 heads)
+ new changesets 61246295ee1e:99cae3713489
updating to branch default
14 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R noconst-chain debugindex -m
diff --git a/tests/test-globalopts.t b/tests/test-globalopts.t
--- a/tests/test-globalopts.t
+++ b/tests/test-globalopts.t
@@ -31,6 +31,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets b6c483daf290
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-glog-topological.t b/tests/test-glog-topological.t
--- a/tests/test-glog-topological.t
+++ b/tests/test-glog-topological.t
@@ -16,6 +16,7 @@ later.
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
+ new changesets bfaf4b5cbf01:916f1afdef90
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg log -G
diff --git a/tests/test-glog.t b/tests/test-glog.t
--- a/tests/test-glog.t
+++ b/tests/test-glog.t
@@ -1214,6 +1214,7 @@ Incoming and outgoing:
adding manifests
adding file changes
added 31 changesets with 31 changes to 1 files
+ new changesets e6eb3150255d:621d83e11f67
$ cd repo2
$ hg incoming --graph ../repo
diff --git a/tests/test-hardlinks.t b/tests/test-hardlinks.t
--- a/tests/test-hardlinks.t
+++ b/tests/test-hardlinks.t
@@ -77,6 +77,7 @@ Create non-hardlinked clone r3:
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets 40d85e9847f2:7069c422939c
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-hgweb-diffs.t b/tests/test-hgweb-diffs.t
--- a/tests/test-hgweb-diffs.t
+++ b/tests/test-hgweb-diffs.t
@@ -1111,6 +1111,7 @@ test import rev as raw-rev
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 0cd96de13884
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd test1
diff --git a/tests/test-histedit-base.t b/tests/test-histedit-base.t
--- a/tests/test-histedit-base.t
+++ b/tests/test-histedit-base.t
@@ -18,6 +18,7 @@ Create repo a:
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
+ new changesets cd010b8cd998:02de42196ebe
(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
diff --git a/tests/test-histedit-commute.t b/tests/test-histedit-commute.t
--- a/tests/test-histedit-commute.t
+++ b/tests/test-histedit-commute.t
@@ -362,6 +362,7 @@ should also work if a commit message is
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
+ new changesets 141947992243:bd22688093b3
(run 'hg update' to get a working copy)
$ hg co tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-hook.t b/tests/test-hook.t
--- a/tests/test-hook.t
+++ b/tests/test-hook.t
@@ -112,6 +112,7 @@ test generic hooks
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
+ new changesets ab228980c14d:07f3376c1e65
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_NODE_LAST=07f3376c1e655977439df2a814e3cc14b27abac2 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a
@@ -362,6 +363,7 @@ outgoing hooks can see env vars
adding file changes
added 1 changesets with 1 changes to 1 files
adding remote bookmark quux
+ new changesets 539e4b31b6dc
(run 'hg update' to get a working copy)
$ hg rollback
repository tip rolled back to revision 3 (undo pull)
@@ -573,6 +575,7 @@ different between Python 2.6 and Python
adding file changes
added 1 changesets with 1 changes to 1 files
adding remote bookmark quux
+ new changesets 539e4b31b6dc
(run 'hg update' to get a working copy)
post- python hooks that fail to *run* don't cause an abort
diff --git a/tests/test-http-bad-server.t b/tests/test-http-bad-server.t
--- a/tests/test-http-bad-server.t
+++ b/tests/test-http-bad-server.t
@@ -828,6 +828,7 @@ This is before the 0 size chunked transf
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 96ee1d7354c4
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -871,6 +872,7 @@ Server sends a size 0 chunked-transfer s
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 96ee1d7354c4
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-http-branchmap.t b/tests/test-http-branchmap.t
--- a/tests/test-http-branchmap.t
+++ b/tests/test-http-branchmap.t
@@ -21,6 +21,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 867c11ce77b8
updating to branch \xc3\xa6 (esc)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg --encoding utf-8 -R b log
diff --git a/tests/test-http-bundle1.t b/tests/test-http-bundle1.t
--- a/tests/test-http-bundle1.t
+++ b/tests/test-http-bundle1.t
@@ -64,6 +64,7 @@ try to clone via stream, should use pull
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
+ new changesets 8b6053c928fe
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -83,6 +84,7 @@ try to clone via stream but missing requ
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
+ new changesets 8b6053c928fe
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -94,6 +96,7 @@ clone via pull
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
+ new changesets 8b6053c928fe
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg verify -R copy-pull
@@ -116,6 +119,7 @@ clone over http with --update
adding manifests
adding file changes
added 2 changesets with 5 changes to 5 files
+ new changesets 8b6053c928fe:5fed3813f7f5
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -r . -R updated
@@ -133,6 +137,7 @@ incoming via HTTP
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
+ new changesets 8b6053c928fe
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd partial
@@ -158,6 +163,7 @@ pull
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 5fed3813f7f5
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT1/
(run 'hg update' to get a working copy)
$ cd ..
@@ -236,6 +242,7 @@ test http authentication
adding manifests
adding file changes
added 2 changesets with 5 changes to 5 files
+ new changesets 8b6053c928fe:5fed3813f7f5
updating to branch default
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -337,6 +344,7 @@ clone of serve with repo in root and uns
adding manifests
adding file changes
added 3 changesets with 7 changes to 7 files
+ new changesets 8b6053c928fe:56f9bc90cce6
updating to branch default
abort: HTTP Error 404: Not Found
[255]
@@ -346,6 +354,7 @@ clone of serve with repo in root and uns
adding manifests
adding file changes
added 3 changesets with 7 changes to 7 files
+ new changesets 8b6053c928fe:56f9bc90cce6
updating to branch default
abort: HTTP Error 404: Not Found
[255]
@@ -391,6 +400,7 @@ disable pull-based clones
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
+ new changesets 8b6053c928fe
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg pull -R test-partial-clone
@@ -400,6 +410,7 @@ disable pull-based clones
adding manifests
adding file changes
added 2 changesets with 3 changes to 3 files
+ new changesets 5fed3813f7f5:56f9bc90cce6
(run 'hg update' to get a working copy)
$ cat error.log
diff --git a/tests/test-http-clone-r.t b/tests/test-http-clone-r.t
--- a/tests/test-http-clone-r.t
+++ b/tests/test-http-clone-r.t
@@ -9,6 +9,7 @@ creating 'remote
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
+ new changesets bfaf4b5cbf01:916f1afdef90
(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
@@ -32,6 +33,7 @@ clone remote via stream
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets bfaf4b5cbf01
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -43,6 +45,7 @@ clone remote via stream
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets bfaf4b5cbf01:21f32785131f
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -54,6 +57,7 @@ clone remote via stream
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
+ new changesets bfaf4b5cbf01:4ce51a113780
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -65,6 +69,7 @@ clone remote via stream
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
+ new changesets bfaf4b5cbf01:93ee6ab32777
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -76,6 +81,7 @@ clone remote via stream
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets bfaf4b5cbf01:c70afb1ee985
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -87,6 +93,7 @@ clone remote via stream
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
+ new changesets bfaf4b5cbf01:f03ae5a9b979
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -98,6 +105,7 @@ clone remote via stream
adding manifests
adding file changes
added 4 changesets with 5 changes to 2 files
+ new changesets bfaf4b5cbf01:095cb14b1b4d
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -109,6 +117,7 @@ clone remote via stream
adding manifests
adding file changes
added 5 changesets with 6 changes to 3 files
+ new changesets bfaf4b5cbf01:faa2e4234c7a
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -120,6 +129,7 @@ clone remote via stream
adding manifests
adding file changes
added 5 changesets with 5 changes to 2 files
+ new changesets bfaf4b5cbf01:916f1afdef90
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -135,6 +145,7 @@ clone remote via stream
adding manifests
adding file changes
added 4 changesets with 2 changes to 3 files (+1 heads)
+ new changesets c70afb1ee985:faa2e4234c7a
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg verify
checking changesets
@@ -151,6 +162,7 @@ clone remote via stream
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
+ new changesets c70afb1ee985
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg verify
checking changesets
@@ -165,6 +177,7 @@ clone remote via stream
adding manifests
adding file changes
added 6 changesets with 5 changes to 4 files
+ new changesets 4ce51a113780:916f1afdef90
(run 'hg update' to get a working copy)
$ cd ..
$ cd test-2
@@ -175,6 +188,7 @@ clone remote via stream
adding manifests
adding file changes
added 2 changesets with 0 changes to 0 files (+1 heads)
+ new changesets c70afb1ee985:f03ae5a9b979
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg verify
checking changesets
@@ -189,6 +203,7 @@ clone remote via stream
adding manifests
adding file changes
added 4 changesets with 4 changes to 4 files
+ new changesets 93ee6ab32777:916f1afdef90
(run 'hg update' to get a working copy)
$ hg verify
checking changesets
diff --git a/tests/test-http-proxy.t b/tests/test-http-proxy.t
--- a/tests/test-http-proxy.t
+++ b/tests/test-http-proxy.t
@@ -39,6 +39,7 @@ url for proxy, pull
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 83180e7845de
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd b-pull
@@ -58,6 +59,7 @@ host:port for proxy
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 83180e7845de
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -69,6 +71,7 @@ proxy url with user name and password
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 83180e7845de
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -80,6 +83,7 @@ url with user name and password
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 83180e7845de
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -98,6 +102,7 @@ do not use the proxy if it is in the no
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 83180e7845de
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat proxy.log
diff --git a/tests/test-http.t b/tests/test-http.t
--- a/tests/test-http.t
+++ b/tests/test-http.t
@@ -55,6 +55,7 @@ try to clone via stream, should use pull
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
+ new changesets 8b6053c928fe
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -74,6 +75,7 @@ try to clone via stream but missing requ
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
+ new changesets 8b6053c928fe
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -85,6 +87,7 @@ clone via pull
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
+ new changesets 8b6053c928fe
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg verify -R copy-pull
@@ -107,6 +110,7 @@ clone over http with --update
adding manifests
adding file changes
added 2 changesets with 5 changes to 5 files
+ new changesets 8b6053c928fe:5fed3813f7f5
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -r . -R updated
@@ -124,6 +128,7 @@ incoming via HTTP
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
+ new changesets 8b6053c928fe
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd partial
@@ -149,6 +154,7 @@ pull
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 5fed3813f7f5
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT1/
(run 'hg update' to get a working copy)
$ cd ..
@@ -227,6 +233,7 @@ test http authentication
adding manifests
adding file changes
added 2 changesets with 5 changes to 5 files
+ new changesets 8b6053c928fe:5fed3813f7f5
updating to branch default
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -325,6 +332,7 @@ clone of serve with repo in root and uns
adding manifests
adding file changes
added 3 changesets with 7 changes to 7 files
+ new changesets 8b6053c928fe:56f9bc90cce6
updating to branch default
abort: HTTP Error 404: Not Found
[255]
@@ -334,6 +342,7 @@ clone of serve with repo in root and uns
adding manifests
adding file changes
added 3 changesets with 7 changes to 7 files
+ new changesets 8b6053c928fe:56f9bc90cce6
updating to branch default
abort: HTTP Error 404: Not Found
[255]
@@ -381,6 +390,7 @@ disable pull-based clones
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
+ new changesets 8b6053c928fe
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg pull -R test-partial-clone
@@ -390,6 +400,7 @@ disable pull-based clones
adding manifests
adding file changes
added 2 changesets with 3 changes to 3 files
+ new changesets 5fed3813f7f5:56f9bc90cce6
(run 'hg update' to get a working copy)
corrupt cookies file should yield a warning
diff --git a/tests/test-https.t b/tests/test-https.t
--- a/tests/test-https.t
+++ b/tests/test-https.t
@@ -148,6 +148,7 @@ A per-host certificate matching the serv
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
+ new changesets 8b6053c928fe
A per-host certificate with multiple certs and one matching will be accepted
@@ -159,6 +160,7 @@ A per-host certificate with multiple cer
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
+ new changesets 8b6053c928fe
Defining both per-host certificate and a fingerprint will print a warning
@@ -170,6 +172,7 @@ Defining both per-host certificate and a
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
+ new changesets 8b6053c928fe
$ DISABLECACERTS="--config devel.disableloaddefaultcerts=true"
@@ -189,6 +192,7 @@ Inability to verify peer certificate wil
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
+ new changesets 8b6053c928fe
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg verify -R copy-pull
@@ -226,6 +230,7 @@ pull without cacert
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 5fed3813f7f5
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=https://localhost:$HGPORT/
(run 'hg update' to get a working copy)
$ cd ..
diff --git a/tests/test-import-bypass.t b/tests/test-import-bypass.t
--- a/tests/test-import-bypass.t
+++ b/tests/test-import-bypass.t
@@ -266,6 +266,7 @@ Test applying multiple patches
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets 07f494440405:4e322f7ce8e3
updating to branch foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo-multi1
@@ -292,6 +293,7 @@ Test applying multiple patches with --ex
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets 07f494440405:4e322f7ce8e3
updating to branch foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo-multi2
diff --git a/tests/test-import-merge.t b/tests/test-import-merge.t
--- a/tests/test-import-merge.t
+++ b/tests/test-import-merge.t
@@ -37,6 +37,7 @@ Test import and merge diffs
adding manifests
adding file changes
added 3 changesets with 3 changes to 2 files
+ new changesets 07f494440405:890ecaa90481
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo2
@@ -47,6 +48,7 @@ Test import and merge diffs
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 102a90ea7b4a
(run 'hg heads' to see heads, 'hg merge' to merge)
Test without --exact and diff.p1 == workingdir.p1
diff --git a/tests/test-import.t b/tests/test-import.t
--- a/tests/test-import.t
+++ b/tests/test-import.t
@@ -31,6 +31,7 @@ commit message and '--edit' is not speci
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 80971e65b431
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ HGEDITOR=cat hg --cwd b import ../exported-tip.patch
@@ -62,6 +63,7 @@ regardless of the commit message in the
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 80971e65b431
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ HGEDITOR=cat hg --config ui.patch="$PYTHON ../dummypatch.py" --cwd b import --edit ../exported-tip.patch
@@ -89,6 +91,7 @@ the commit message, regardless of '--edi
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 80971e65b431
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat > $TESTTMP/editor.sh <<EOF
@@ -134,6 +137,7 @@ import of plain diff should be ok with m
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 80971e65b431
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg --cwd b import -mpatch ../diffed-tip.patch
@@ -150,6 +154,7 @@ import of plain diff with specific date
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 80971e65b431
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg --cwd b import -mpatch -d '1 0' -u 'user at nowhere.net' ../diffed-tip.patch
@@ -183,6 +188,7 @@ specified, regardless of '--edit')
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 80971e65b431
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ HGEDITOR=cat hg --cwd b import --no-commit --edit ../diffed-tip.patch
@@ -204,6 +210,7 @@ import of malformed plain diff should fa
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 80971e65b431
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ sed 's/1,1/foo/' < diffed-tip.patch > broken.patch
@@ -224,6 +231,7 @@ used to hide a bug.
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 80971e65b431
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd dir
@@ -240,6 +248,7 @@ import from stdin
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 80971e65b431
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg --cwd b import - < exported-tip.patch
@@ -266,6 +275,7 @@ override commit message
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 80971e65b431
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg --cwd b import -m 'override' - < exported-tip.patch
@@ -292,6 +302,7 @@ plain diff in email, subject, message bo
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 80971e65b431
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ $PYTHON mkmsg.py diffed-tip.patch msg.patch
@@ -310,6 +321,7 @@ plain diff in email, no subject, message
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 80971e65b431
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ grep -v '^Subject:' msg.patch | hg --cwd b import -
@@ -324,6 +336,7 @@ plain diff in email, subject, no message
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 80971e65b431
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ grep -v '^email ' msg.patch | hg --cwd b import -
@@ -338,6 +351,7 @@ plain diff in email, no subject, no mess
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 80971e65b431
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ egrep -v '^(Subject|email)' msg.patch | hg --cwd b import -
@@ -354,6 +368,7 @@ hg export in email, should use patch hea
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 80971e65b431
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ $PYTHON mkmsg.py exported-tip.patch msg.patch
@@ -385,6 +400,7 @@ plain diff in email, [PATCH] subject, me
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 80971e65b431
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ $PYTHON mkmsg2.py diffed-tip.patch msg.patch
@@ -653,6 +669,7 @@ hg import in a subdirectory
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 80971e65b431
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg --cwd a export tip > tmp
diff --git a/tests/test-incoming-outgoing.t b/tests/test-incoming-outgoing.t
--- a/tests/test-incoming-outgoing.t
+++ b/tests/test-incoming-outgoing.t
@@ -329,12 +329,14 @@ test the resulting bundles
adding manifests
adding file changes
added 9 changesets with 9 changes to 1 files
+ new changesets 00a43fa82f62:e4feb4ac9035
(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
(run 'hg update' to get a working copy)
$ hg -R temp tip
changeset: 8:e4feb4ac9035
diff --git a/tests/test-issue1306.t b/tests/test-issue1306.t
--- a/tests/test-issue1306.t
+++ b/tests/test-issue1306.t
@@ -47,6 +47,7 @@ Try cloning -r branch:
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
+ new changesets cb9a9f314b8b:ae3d9c30ec50
updating to branch br
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -66,6 +67,7 @@ Try cloning -rother clone#branch:
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
+ new changesets cb9a9f314b8b:ae3d9c30ec50
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -83,6 +85,7 @@ Try cloning -r1 clone#branch:
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
+ new changesets cb9a9f314b8b:ae3d9c30ec50
updating to branch br
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-issue1502.t b/tests/test-issue1502.t
--- a/tests/test-issue1502.t
+++ b/tests/test-issue1502.t
@@ -19,6 +19,7 @@ Initialize repository
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 273d008d6e8e
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R foo1 book branchy
@@ -35,6 +36,7 @@ Pull. Bookmark should not jump to new he
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 84a798d48b17
(run 'hg update' to get a working copy)
$ hg -R foo1 book
diff --git a/tests/test-issue1802.t b/tests/test-issue1802.t
--- a/tests/test-issue1802.t
+++ b/tests/test-issue1802.t
@@ -43,6 +43,7 @@ Create extension that can disable exec c
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
+ new changesets 2d8bcf2dda39
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg manifest -v -r tip
diff --git a/tests/test-issue586.t b/tests/test-issue586.t
--- a/tests/test-issue586.t
+++ b/tests/test-issue586.t
@@ -22,6 +22,7 @@ dirstate
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets cb9a9f314b8b
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -57,6 +58,7 @@ create test repos
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 7132ab4568ac
(run 'hg update' to get a working copy)
$ hg update
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -72,6 +74,7 @@ create test repos
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 5ddceb349652
(run 'hg heads' to see heads, 'hg merge' to merge)
merge both repos
diff --git a/tests/test-keyword.t b/tests/test-keyword.t
--- a/tests/test-keyword.t
+++ b/tests/test-keyword.t
@@ -125,6 +125,7 @@ A bundle to test this was made with:
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets a2392c293916
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo 'expand $Id$' > a
@@ -260,6 +261,7 @@ Pull from bundle and trigger notify
adding manifests
adding file changes
added 2 changesets with 3 changes to 3 files
+ new changesets a2392c293916:ef63ca68695b
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
@@ -918,6 +920,7 @@ Clone to test incoming
adding manifests
adding file changes
added 2 changesets with 3 changes to 3 files
+ new changesets a2392c293916:ef63ca68695b
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd Test-a
diff --git a/tests/test-largefiles-cache.t b/tests/test-largefiles-cache.t
--- a/tests/test-largefiles-cache.t
+++ b/tests/test-largefiles-cache.t
@@ -45,6 +45,7 @@ repo as "default" path in .hg/hgrc.
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
+ new changesets eb85d9124f3f:26c18ce05e4e
(run 'hg update' to get a working copy)
Update working directory to "tip", which requires largefile("large"),
@@ -86,6 +87,7 @@ Verify that largefiles from pulled branc
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets eb85d9124f3f
(run 'hg update' to get a working copy)
#if unix-permissions
diff --git a/tests/test-largefiles-misc.t b/tests/test-largefiles-misc.t
--- a/tests/test-largefiles-misc.t
+++ b/tests/test-largefiles-misc.t
@@ -111,6 +111,7 @@ We have to simulate that here by setting
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 09a186cfa6da
updating to branch default
getting changed largefiles
1 largefiles updated, 0 removed
@@ -1113,6 +1114,7 @@ Test "pull --rebase" when rebase is enab
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets bf5e395ced2c
nothing to rebase - updating instead
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-largefiles-small-disk.t b/tests/test-largefiles-small-disk.t
--- a/tests/test-largefiles-small-disk.t
+++ b/tests/test-largefiles-small-disk.t
@@ -63,6 +63,7 @@ makes copies instead of hardlinks:
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 390cf214e9ac
updating to branch default
getting changed largefiles
abort: No space left on device
diff --git a/tests/test-largefiles-update.t b/tests/test-largefiles-update.t
--- a/tests/test-largefiles-update.t
+++ b/tests/test-largefiles-update.t
@@ -458,6 +458,7 @@ Test that the internal linear merging wo
adding manifests
adding file changes
added 3 changesets with 5 changes to 5 files
+ new changesets 9530e27857f7:d65e59e952a9
remote turned local largefile large2 into a normal file
keep (l)argefile or use (n)ormal file? l
largefile large1 has a merge conflict
@@ -493,6 +494,7 @@ Test that the internal linear merging wo
adding manifests
adding file changes
added 3 changesets with 5 changes to 5 files
+ new changesets 9530e27857f7:d65e59e952a9
remote turned local largefile large2 into a normal file
keep (l)argefile or use (n)ormal file? l
largefile large1 has a merge conflict
diff --git a/tests/test-largefiles-wireproto.t b/tests/test-largefiles-wireproto.t
--- a/tests/test-largefiles-wireproto.t
+++ b/tests/test-largefiles-wireproto.t
@@ -41,6 +41,7 @@ vanilla clients not locked out from larg
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets b6eb3a2e2efe
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -53,6 +54,7 @@ largefiles clients still work with vanil
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets b6eb3a2e2efe
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
#endif
@@ -224,6 +226,7 @@ Clone over http, no largefiles pulled on
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets cf03e5bb9936
Archive contains largefiles
>>> import os
@@ -339,6 +342,7 @@ largefiles should batch verify remote ca
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets 567253b0f523:04d19c27a332
$ hg -R batchverifyclone verify --large --lfa
checking changesets
checking manifests
@@ -375,6 +379,7 @@ available locally.
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 6bba8cb6935d
(run 'hg update' to get a working copy)
$ hg -R batchverifyclone verify --lfa
checking changesets
@@ -437,6 +442,7 @@ a large file from the server rather than
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 567253b0f523
updating to branch default
getting changed largefiles
1 largefiles updated, 0 removed
diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t
--- a/tests/test-largefiles.t
+++ b/tests/test-largefiles.t
@@ -961,6 +961,7 @@ Test clone at revision
adding manifests
adding file changes
added 4 changesets with 10 changes to 4 files
+ new changesets 30d30fe6a5be:9e8fbc4bce62
updating to branch default
getting changed largefiles
2 largefiles updated, 0 removed
@@ -1089,6 +1090,7 @@ downloaded from 'default' instead of 'de
adding manifests
adding file changes
added 2 changesets with 8 changes to 4 files
+ new changesets 30d30fe6a5be:ce8896473775
updating to branch default
getting changed largefiles
2 largefiles updated, 0 removed
@@ -1102,6 +1104,7 @@ downloaded from 'default' instead of 'de
adding manifests
adding file changes
added 6 changesets with 16 changes to 8 files
+ new changesets 51a0ae4d5864:daea875e9014
(run 'hg update' to get a working copy)
6 largefiles cached
@@ -1129,6 +1132,7 @@ redo pull with --lfrev and check it pull
adding manifests
adding file changes
added 6 changesets with 16 changes to 8 files
+ new changesets 51a0ae4d5864:daea875e9014
calling hook changegroup.lfiles: hgext.largefiles.reposetup.checkrequireslfiles
(run 'hg update' to get a working copy)
pulling largefiles for revision 7
@@ -1201,6 +1205,7 @@ rebased or not.
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files (+1 heads)
+ new changesets a381d2c8c80e
rebasing 8:f574fb32bb45 "modify normal file largefile in repo d"
Invoking status precommit hook
M sub/normal4
@@ -1258,6 +1263,7 @@ rebased or not.
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files (+1 heads)
+ new changesets a381d2c8c80e
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg rebase
rebasing 8:f574fb32bb45 "modify normal file largefile in repo d"
@@ -1663,6 +1669,7 @@ correctly.
adding manifests
adding file changes
added 8 changesets with 24 changes to 10 files
+ new changesets 30d30fe6a5be:daea875e9014
updating to branch default
getting changed largefiles
3 largefiles updated, 0 removed
@@ -1688,6 +1695,7 @@ correctly.
adding manifests
adding file changes
added 2 changesets with 4 changes to 4 files (+1 heads)
+ new changesets a381d2c8c80e:598410d3eb9a
(run 'hg heads' to see heads, 'hg merge' to merge)
2 largefiles cached
$ hg merge
@@ -1763,6 +1771,7 @@ Test that transplanting a largefile chan
adding manifests
adding file changes
added 9 changesets with 26 changes to 10 files
+ new changesets 30d30fe6a5be:a381d2c8c80e
updating to branch default
getting changed largefiles
3 largefiles updated, 0 removed
@@ -1775,6 +1784,7 @@ Test that transplanting a largefile chan
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 598410d3eb9a
$ 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
diff --git a/tests/test-manifestv2.t b/tests/test-manifestv2.t
--- a/tests/test-manifestv2.t
+++ b/tests/test-manifestv2.t
@@ -26,6 +26,7 @@ future commits.
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 0fc9a4fafa44
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd new
diff --git a/tests/test-merge-commit.t b/tests/test-merge-commit.t
--- a/tests/test-merge-commit.t
+++ b/tests/test-merge-commit.t
@@ -104,6 +104,7 @@ on the remote parent:
adding manifests
adding file changes
added 3 changesets with 3 changes to 2 files (+1 heads)
+ new changesets 2665aaee66e9:0f2ff26688b9
$ cd b
$ hg up -C 1
diff --git a/tests/test-merge10.t b/tests/test-merge10.t
--- a/tests/test-merge10.t
+++ b/tests/test-merge10.t
@@ -33,6 +33,7 @@ but then local changes are added in the
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets cc7000b01af9
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up -C 2
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-merge6.t b/tests/test-merge6.t
--- a/tests/test-merge6.t
+++ b/tests/test-merge6.t
@@ -41,6 +41,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets b90e70beeb58
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -58,6 +59,7 @@ bar should remain deleted.
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
+ new changesets e1adc944e717
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg merge
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-merge7.t b/tests/test-merge7.t
--- a/tests/test-merge7.t
+++ b/tests/test-merge7.t
@@ -41,6 +41,7 @@ now pull and merge from test-a
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 96b70246a118
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg merge
merging test.txt
@@ -77,6 +78,7 @@ pull and merge from test-a again
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 40d11a4173a8
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg merge --debug
searching for copies back to rev 1
diff --git a/tests/test-merge8.t b/tests/test-merge8.t
--- a/tests/test-merge8.t
+++ b/tests/test-merge8.t
@@ -22,6 +22,7 @@ Test for changeset ba7c74081861
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets e3c9b40284e1:772b37f1ca37
(run 'hg update' to get a working copy)
$ hg update
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-mq-pull-from-bundle.t b/tests/test-mq-pull-from-bundle.t
--- a/tests/test-mq-pull-from-bundle.t
+++ b/tests/test-mq-pull-from-bundle.t
@@ -88,6 +88,7 @@ Pull queue bundle:
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
+ new changesets d7553909353d
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
@@ -119,6 +120,7 @@ Unbundle queue bundle:
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
+ new changesets d7553909353d
merging series
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-mq-qclone-http.t b/tests/test-mq-qclone-http.t
--- a/tests/test-mq-qclone-http.t
+++ b/tests/test-mq-qclone-http.t
@@ -47,11 +47,13 @@ test with recursive collection
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets cb9a9f314b8b:184916345baa
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
+ new changesets 4052ceaa8c4e
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -86,11 +88,13 @@ test with normal collection
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets cb9a9f314b8b:184916345baa
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
+ new changesets 4052ceaa8c4e
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -125,11 +129,13 @@ test with old-style collection
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets cb9a9f314b8b:184916345baa
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
+ new changesets 4052ceaa8c4e
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-mq-safety.t b/tests/test-mq-safety.t
--- a/tests/test-mq-safety.t
+++ b/tests/test-mq-safety.t
@@ -166,6 +166,7 @@ Testing applied patches, push and --forc
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 07f494440405
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo a >> a
diff --git a/tests/test-mq.t b/tests/test-mq.t
--- a/tests/test-mq.t
+++ b/tests/test-mq.t
@@ -782,6 +782,7 @@ strip
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 770eb8fce608
(run 'hg update' to get a working copy)
diff --git a/tests/test-notify-changegroup.t b/tests/test-notify-changegroup.t
--- a/tests/test-notify-changegroup.t
+++ b/tests/test-notify-changegroup.t
@@ -85,6 +85,7 @@ unbundle with unrelated source
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets cb9a9f314b8b:ba677d0156c1
(run 'hg update' to get a working copy)
$ hg --cwd a rollback
repository tip rolled back to revision -1 (undo unbundle)
@@ -97,6 +98,7 @@ unbundle with correct source
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets cb9a9f314b8b:ba677d0156c1
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
diff --git a/tests/test-notify.t b/tests/test-notify.t
--- a/tests/test-notify.t
+++ b/tests/test-notify.t
@@ -188,6 +188,7 @@ pull (minimal config)
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 0647d048b600
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
@@ -241,6 +242,7 @@ pull
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 0647d048b600
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
@@ -283,6 +285,7 @@ pull
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 0647d048b600
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
@@ -328,6 +331,7 @@ test merge
adding manifests
adding file changes
added 2 changesets with 0 changes to 0 files
+ new changesets 0a184ce6067f:6a0cf76b2701
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
@@ -383,6 +387,7 @@ non-ascii content and truncation of mult
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 7ea05ad269dc
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 8bit
@@ -425,6 +430,7 @@ long lines
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets a323cae54f6e
notify: sending 2 subscribers 1 changes
(run 'hg update' to get a working copy)
$ $PYTHON $TESTTMP/filter.py < b/mbox
@@ -494,6 +500,7 @@ long lines
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets b7cf10b2bdec
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
@@ -523,6 +530,7 @@ from different branch
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
+ new changesets 5a07df312a79
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
diff --git a/tests/test-obsmarker-template.t b/tests/test-obsmarker-template.t
--- a/tests/test-obsmarker-template.t
+++ b/tests/test-obsmarker-template.t
@@ -1024,6 +1024,7 @@ Test setup
added 1 changesets with 0 changes to 1 files (+1 heads)
2 new obsolescence markers
obsoleted 1 changesets
+ new changesets 7a230b46bf61
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg log --hidden -G
o changeset: 2:7a230b46bf61
diff --git a/tests/test-obsolete-bundle-strip.t b/tests/test-obsolete-bundle-strip.t
--- a/tests/test-obsolete-bundle-strip.t
+++ b/tests/test-obsolete-bundle-strip.t
@@ -207,6 +207,7 @@ Actual testing
# 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: (run 'hg heads' to see heads)
$ testrevs 'desc("C-A")'
@@ -246,6 +247,7 @@ Actual testing
# 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: (run 'hg heads' to see heads)
chain with prune children
@@ -371,6 +373,7 @@ problematic)
# 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: (run 'hg heads' to see heads)
bundling multiple revisions
@@ -432,6 +435,7 @@ bundling multiple revisions
# 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: (run 'hg heads' to see heads)
chain with precursors also pruned
@@ -532,6 +536,7 @@ Actual testing
# 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: (run 'hg heads' to see heads)
$ testrevs 'desc("C-A")'
@@ -571,6 +576,7 @@ Actual testing
# 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: (run 'hg heads' to see heads)
chain with missing prune
@@ -653,6 +659,7 @@ Actual testing
# unbundling: adding file changes
# unbundling: added 1 changesets with 1 changes to 1 files
# unbundling: 3 new obsolescence markers
+ # unbundling: new changesets cf2c22470d67
# unbundling: (run 'hg update' to get a working copy)
chain with precursors also pruned
@@ -732,6 +739,7 @@ Actual testing
# unbundling: adding file changes
# unbundling: added 1 changesets with 1 changes to 1 files
# unbundling: 3 new obsolescence markers
+ # unbundling: new changesets cf2c22470d67
# unbundling: (run 'hg update' to get a working copy)
Chain with fold and split
@@ -971,6 +979,7 @@ Actual testing
# 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: (run 'hg heads' to see heads)
Bundle multiple revisions
@@ -1072,6 +1081,7 @@ Bundle multiple revisions
# 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: (run 'hg heads' to see heads)
* top one and initial precursors
@@ -1138,6 +1148,7 @@ Bundle multiple revisions
# 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: (run 'hg heads' to see heads)
* top one and one of the split
@@ -1206,6 +1217,7 @@ Bundle multiple revisions
# 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: (run 'hg heads' to see heads)
* all
@@ -1280,6 +1292,7 @@ Bundle multiple revisions
# 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: (run 'hg heads' to see heads)
changeset pruned on its own
@@ -1381,4 +1394,5 @@ Actual testing
# unbundling: adding file changes
# unbundling: added 2 changesets with 2 changes to 2 files
# unbundling: 1 new obsolescence markers
+ # unbundling: new changesets 9ac430e15fca
# unbundling: (run 'hg update' to get a working copy)
diff --git a/tests/test-obsolete-changeset-exchange.t b/tests/test-obsolete-changeset-exchange.t
--- a/tests/test-obsolete-changeset-exchange.t
+++ b/tests/test-obsolete-changeset-exchange.t
@@ -71,6 +71,7 @@ marker to obsolete him)
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
+ new changesets f89bcc95eba5
(run 'hg heads' to see heads, 'hg merge' to merge)
check that bundle is not affected
@@ -123,6 +124,7 @@ initial repo with server and client matc
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
+ new changesets 96ee1d7354c4:6a29ed9c68de
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -168,5 +170,6 @@ client only pulls down 1 changeset
bundle2-input-part: total payload size 24
bundle2-input-bundle: 2 parts total
checking for updated bookmarks
+ new changesets bec0734cd68e
updating the branch cache
(run 'hg heads' to see heads, 'hg merge' to merge)
diff --git a/tests/test-obsolete-checkheads.t b/tests/test-obsolete-checkheads.t
--- a/tests/test-obsolete-checkheads.t
+++ b/tests/test-obsolete-checkheads.t
@@ -236,6 +236,7 @@ setup
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets b4952fcf48cf
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd local
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -365,6 +365,7 @@ Try to pull markers
adding file changes
added 4 changesets with 4 changes to 4 files (+1 heads)
5 new obsolescence markers
+ new changesets 1f0dee641bb7:6f9641995072
(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'}
@@ -470,6 +471,7 @@ On pull
adding file changes
added 4 changesets with 4 changes to 4 files (+1 heads)
5 new obsolescence markers
+ new changesets 1f0dee641bb7:6f9641995072
(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'}
@@ -782,6 +784,7 @@ check hgweb does not explode
adding manifests
adding file changes
added 62 changesets with 63 changes to 9 files (+60 heads)
+ new changesets 50c51b361e60:c15e9edfca13
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`;
> do
@@ -1136,6 +1139,7 @@ Test bundle overlay onto hidden revision
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets 4b34ecfb0d56:44526ebb0f98
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ../other-bundleoverlay
@@ -1393,6 +1397,7 @@ Testing that strip remove markers:
adding file changes
added 2 changesets with 2 changes to 2 files
1 new obsolescence markers
+ new changesets e016b03fd86f:b0551702f918
(run 'hg update' to get a working copy)
$ hg debugobsolete | sort
e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'}
diff --git a/tests/test-patch.t b/tests/test-patch.t
--- a/tests/test-patch.t
+++ b/tests/test-patch.t
@@ -32,6 +32,7 @@ check custom patch options are honored
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 8580ff50825a
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -68,6 +69,7 @@ Clone and apply patch:
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 7fadb901d403
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd d
diff --git a/tests/test-patchbomb.t b/tests/test-patchbomb.t
--- a/tests/test-patchbomb.t
+++ b/tests/test-patchbomb.t
@@ -3053,6 +3053,7 @@ node missing at public
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
+ new changesets 8580ff50825a:2f9fa9b998c5
updating to branch test
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo 'publicurl=$TESTTMP/t3' >> $HGRCPATH
diff --git a/tests/test-phases-exchange.t b/tests/test-phases-exchange.t
--- a/tests/test-phases-exchange.t
+++ b/tests/test-phases-exchange.t
@@ -80,6 +80,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
+ new changesets 54acac6f23ab:b555f63b6063
test-debug-phase: new rev 3: x -> 0
test-debug-phase: new rev 4: x -> 0
(run 'hg heads' to see heads, 'hg merge' to merge)
@@ -148,6 +149,7 @@ update must update phase of common chang
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets f54f1bb90ff3
test-debug-phase: new rev 4: x -> 0
(run 'hg heads' to see heads, 'hg merge' to merge)
@@ -202,6 +204,7 @@ changegroup are added without phase move
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files (+1 heads)
+ new changesets 054250a37db4:b555f63b6063
test-debug-phase: new rev 0: x -> 1
test-debug-phase: new rev 1: x -> 1
test-debug-phase: new rev 2: x -> 1
@@ -235,6 +238,7 @@ Pulling from publish=False to publish=Fa
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
+ new changesets 054250a37db4:54acac6f23ab
test-debug-phase: new rev 0: x -> 1
test-debug-phase: new rev 1: x -> 1
test-debug-phase: new rev 2: x -> 1
@@ -256,6 +260,7 @@ Even for common
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets f54f1bb90ff3
test-debug-phase: new rev 3: x -> 1
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hgph
@@ -279,6 +284,7 @@ we are in nu
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets b555f63b6063
test-debug-phase: move rev 0: 1 -> 0
test-debug-phase: move rev 1: 1 -> 0
test-debug-phase: move rev 2: 1 -> 0
@@ -326,6 +332,7 @@ pulling from Publish=False to publish=Fa
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets d6bcb4f74035:145e75495359
test-debug-phase: move rev 0: 1 -> 0
test-debug-phase: move rev 1: 1 -> 0
test-debug-phase: move rev 3: 1 -> 0
@@ -371,6 +378,7 @@ pulling into publish=True
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets d6bcb4f74035:145e75495359
test-debug-phase: new rev 5: x -> 1
test-debug-phase: new rev 6: x -> 1
(run 'hg update' to get a working copy)
@@ -930,6 +938,7 @@ Discovery locally secret changeset on a
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 435b5d83910c
test-debug-phase: new rev 10: x -> 1
(run 'hg update' to get a working copy)
$ hgph -R ../mu
@@ -1059,6 +1068,7 @@ pull new changeset with common draft loc
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 5237fb433fc8
test-debug-phase: new rev 13: x -> 1
(run 'hg update' to get a working copy)
$ hgph
@@ -1120,6 +1130,7 @@ Test that test are properly ignored on r
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets e9f537e46dea:b740e3e5c05d
test-debug-phase: new rev 5: x -> 0
test-debug-phase: new rev 6: x -> 0
(run 'hg update' to get a working copy)
diff --git a/tests/test-phases.t b/tests/test-phases.t
--- a/tests/test-phases.t
+++ b/tests/test-phases.t
@@ -247,6 +247,7 @@ Test secret changeset are not pull
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files (+1 heads)
+ new changesets 4a2df7238c3b:cf9fe039dfd6
test-debug-phase: new rev 0: x -> 0
test-debug-phase: new rev 1: x -> 0
test-debug-phase: new rev 2: x -> 0
@@ -602,6 +603,7 @@ test hidden changeset are not cloned as
adding manifests
adding file changes
added 7 changesets with 6 changes to 6 files
+ new changesets 4a2df7238c3b:17a481b3bccb
test-debug-phase: new rev 0: x -> 0
test-debug-phase: new rev 1: x -> 0
test-debug-phase: new rev 2: x -> 0
diff --git a/tests/test-pull-branch.t b/tests/test-pull-branch.t
--- a/tests/test-pull-branch.t
+++ b/tests/test-pull-branch.t
@@ -19,6 +19,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets 495a0ec48aaf:50e089d141b7
(run 'hg update' to get a working copy)
$ hg up branchA
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -47,6 +48,7 @@ A new branch is there
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files (+1 heads)
+ new changesets 9f878dea0b96:5be59ce5067b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Develop both branches:
@@ -72,6 +74,7 @@ Should succeed, no new heads:
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets 7c8fe7e20c32:453e93fa00a5
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Add a head on other branch:
@@ -102,6 +105,7 @@ Should succeed because there is only one
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files (+1 heads)
+ new changesets da3a8a0161c6:b61cab8fe4e8
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ../t
@@ -132,6 +136,7 @@ Should succeed because there is only one
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files (+1 heads)
+ new changesets 0c4d148ae29e:ecfc3f4a6fd9
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "d740e1a584e7: a5.2"
1 other heads for branch "branchA"
@@ -164,6 +169,7 @@ Pull branchC from tt
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 7d8ffa4c0b22
(run 'hg heads' to see heads)
Make changes on default and branchC on tt
@@ -176,6 +182,7 @@ Make changes on default and branchC on t
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 2b94b54b6b5f
(run 'hg heads' to see heads)
$ hg up -C default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -211,6 +218,7 @@ Pull from tt
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+2 heads)
+ new changesets eed40c14b407:e634733b0309
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ cd ..
diff --git a/tests/test-pull-http.t b/tests/test-pull-http.t
--- a/tests/test-pull-http.t
+++ b/tests/test-pull-http.t
@@ -23,6 +23,7 @@ Cloning with a password in the URL shoul
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets cb9a9f314b8b:ba677d0156c1
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat test3/.hg/hgrc
diff --git a/tests/test-pull-permission.t b/tests/test-pull-permission.t
--- a/tests/test-pull-permission.t
+++ b/tests/test-pull-permission.t
@@ -16,6 +16,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 97310831fa1a
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-pull-pull-corruption.t b/tests/test-pull-pull-corruption.t
--- a/tests/test-pull-pull-corruption.t
+++ b/tests/test-pull-pull-corruption.t
@@ -18,6 +18,7 @@ create one repo with a shorter history
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 495a0ec48aaf
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd source2
@@ -49,6 +50,7 @@ start a pull...
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets ca3c05af513e
(run 'hg heads' to see heads, 'hg merge' to merge)
$ cat pull.out
pulling from ../source1
@@ -57,6 +59,7 @@ start a pull...
adding manifests
adding file changes
added 10 changesets with 10 changes to 1 files
+ new changesets 495a0ec48aaf:1e7b6c812ca8
(run 'hg update' to get a working copy)
see the result
diff --git a/tests/test-pull-r.t b/tests/test-pull-r.t
--- a/tests/test-pull-r.t
+++ b/tests/test-pull-r.t
@@ -49,6 +49,7 @@ don't show "(+1 heads)" message when pul
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
+ new changesets 8c900227dd5d:00cfe9073916
(run 'hg update' to get a working copy)
$ hg heads -q --closed
4:00cfe9073916
@@ -121,6 +122,7 @@ We use http because http is better is ou
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets effea6de0384
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G
@ changeset: 2:effea6de0384
diff --git a/tests/test-pull-update.t b/tests/test-pull-update.t
--- a/tests/test-pull-update.t
+++ b/tests/test-pull-update.t
@@ -26,6 +26,7 @@ Should respect config to disable dirty u
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 107cefe13e42
abort: uncommitted changes
[255]
$ hg --config extensions.strip= strip --no-backup tip
@@ -40,6 +41,7 @@ Should not update to the other topologic
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 107cefe13e42
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "800c91d5bfc1: m"
1 other heads for branch "default"
@@ -55,6 +57,7 @@ Should not update to the other branch:
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 800c91d5bfc1
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "107cefe13e42: m"
1 other heads for branch "default"
@@ -76,6 +79,7 @@ Should work:
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (-1 heads)
+ new changesets 483b76ad4309
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Similarity between "hg update" and "hg pull -u" in handling bookmark
@@ -103,6 +107,7 @@ explicit destination of the update.
adding file changes
added 1 changesets with 1 changes to 1 files
adding remote bookmark active-after-pull
+ new changesets f815b3da6163
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark active-after-pull)
@@ -131,6 +136,7 @@ explicit destination of the update.
adding file changes
added 1 changesets with 1 changes to 1 files
adding remote bookmark active-after-pull
+ new changesets f815b3da6163
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark active-after-pull)
@@ -168,6 +174,7 @@ match with the name of any existing book
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
+ new changesets f815b3da6163:b5e4babfaaa7
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark active-before-pull)
@@ -194,6 +201,7 @@ match with the name of any existing book
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
+ new changesets f815b3da6163:b5e4babfaaa7
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark active-before-pull)
@@ -220,6 +228,7 @@ match with the name of any existing book
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
+ new changesets f815b3da6163:b5e4babfaaa7
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark active-before-pull)
diff --git a/tests/test-pull.t b/tests/test-pull.t
--- a/tests/test-pull.t
+++ b/tests/test-pull.t
@@ -25,6 +25,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 340e38bdcde4
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -76,6 +77,7 @@ Issue622: hg init && hg pull -u URL does
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 340e38bdcde4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Test 'file:' uri handling:
diff --git a/tests/test-push-checkheads-partial-C1.t b/tests/test-push-checkheads-partial-C1.t
--- a/tests/test-push-checkheads-partial-C1.t
+++ b/tests/test-push-checkheads-partial-C1.t
@@ -53,6 +53,7 @@ Test setup
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-push-checkheads-partial-C2.t b/tests/test-push-checkheads-partial-C2.t
--- a/tests/test-push-checkheads-partial-C2.t
+++ b/tests/test-push-checkheads-partial-C2.t
@@ -53,6 +53,7 @@ Test setup
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-push-checkheads-partial-C3.t b/tests/test-push-checkheads-partial-C3.t
--- a/tests/test-push-checkheads-partial-C3.t
+++ b/tests/test-push-checkheads-partial-C3.t
@@ -53,6 +53,7 @@ Test setup
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-push-checkheads-partial-C4.t b/tests/test-push-checkheads-partial-C4.t
--- a/tests/test-push-checkheads-partial-C4.t
+++ b/tests/test-push-checkheads-partial-C4.t
@@ -53,6 +53,7 @@ Test setup
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-push-checkheads-pruned-B2.t b/tests/test-push-checkheads-pruned-B2.t
--- a/tests/test-push-checkheads-pruned-B2.t
+++ b/tests/test-push-checkheads-pruned-B2.t
@@ -53,6 +53,7 @@ Test setup
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-push-checkheads-pruned-B3.t b/tests/test-push-checkheads-pruned-B3.t
--- a/tests/test-push-checkheads-pruned-B3.t
+++ b/tests/test-push-checkheads-pruned-B3.t
@@ -53,6 +53,7 @@ Test setup
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-push-checkheads-pruned-B4.t b/tests/test-push-checkheads-pruned-B4.t
--- a/tests/test-push-checkheads-pruned-B4.t
+++ b/tests/test-push-checkheads-pruned-B4.t
@@ -54,6 +54,7 @@ Test setup
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-push-checkheads-pruned-B5.t b/tests/test-push-checkheads-pruned-B5.t
--- a/tests/test-push-checkheads-pruned-B5.t
+++ b/tests/test-push-checkheads-pruned-B5.t
@@ -57,6 +57,7 @@ Test setup
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets d73caddc5533:821fb21d0dd2
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-push-checkheads-pruned-B8.t b/tests/test-push-checkheads-pruned-B8.t
--- a/tests/test-push-checkheads-pruned-B8.t
+++ b/tests/test-push-checkheads-pruned-B8.t
@@ -55,6 +55,7 @@ Test setup
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-push-checkheads-superceed-A2.t b/tests/test-push-checkheads-superceed-A2.t
--- a/tests/test-push-checkheads-superceed-A2.t
+++ b/tests/test-push-checkheads-superceed-A2.t
@@ -52,6 +52,7 @@ Test setup
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-push-checkheads-superceed-A3.t b/tests/test-push-checkheads-superceed-A3.t
--- a/tests/test-push-checkheads-superceed-A3.t
+++ b/tests/test-push-checkheads-superceed-A3.t
@@ -55,6 +55,7 @@ Test setup
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-push-checkheads-superceed-A6.t b/tests/test-push-checkheads-superceed-A6.t
--- a/tests/test-push-checkheads-superceed-A6.t
+++ b/tests/test-push-checkheads-superceed-A6.t
@@ -59,6 +59,7 @@ Test setup
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
+ new changesets d73caddc5533:0f88766e02d6
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-push-checkheads-superceed-A7.t b/tests/test-push-checkheads-superceed-A7.t
--- a/tests/test-push-checkheads-superceed-A7.t
+++ b/tests/test-push-checkheads-superceed-A7.t
@@ -59,6 +59,7 @@ Test setup
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
+ new changesets d73caddc5533:0f88766e02d6
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up 'desc(C0)'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-push-checkheads-unpushed-D2.t b/tests/test-push-checkheads-unpushed-D2.t
--- a/tests/test-push-checkheads-unpushed-D2.t
+++ b/tests/test-push-checkheads-unpushed-D2.t
@@ -57,6 +57,7 @@ Test setup
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-push-checkheads-unpushed-D3.t b/tests/test-push-checkheads-unpushed-D3.t
--- a/tests/test-push-checkheads-unpushed-D3.t
+++ b/tests/test-push-checkheads-unpushed-D3.t
@@ -56,6 +56,7 @@ Test setup
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-push-checkheads-unpushed-D4.t b/tests/test-push-checkheads-unpushed-D4.t
--- a/tests/test-push-checkheads-unpushed-D4.t
+++ b/tests/test-push-checkheads-unpushed-D4.t
@@ -73,6 +73,7 @@ Test setup
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
+ new changesets d73caddc5533:0f88766e02d6
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-push-checkheads-unpushed-D5.t b/tests/test-push-checkheads-unpushed-D5.t
--- a/tests/test-push-checkheads-unpushed-D5.t
+++ b/tests/test-push-checkheads-unpushed-D5.t
@@ -62,6 +62,7 @@ Test setup
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
+ new changesets d73caddc5533:0f88766e02d6
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up 'desc(C0)'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-push-race.t b/tests/test-push-race.t
--- a/tests/test-push-race.t
+++ b/tests/test-push-race.t
@@ -138,6 +138,7 @@ clone it in two clients
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 842e2fac6304
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg clone ssh://user@dummy/server client-other
@@ -146,6 +147,7 @@ clone it in two clients
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 842e2fac6304
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -230,6 +232,7 @@ Both try to replace a different head
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets a9149a1428e2
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R ./client-other pull
pulling from ssh://user@dummy/server
@@ -238,6 +241,7 @@ Both try to replace a different head
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets a9149a1428e2
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -246,6 +250,7 @@ Both try to replace a different head
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 98217d5a1659
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R server graph
@@ -349,6 +354,7 @@ Pushing a new changeset while someone cr
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 59e76faf78bd
(run 'hg update' to get a working copy)
#endif
@@ -368,6 +374,7 @@ Pushing a new changeset while someone cr
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 59e76faf78bd
(run 'hg update' to get a working copy)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -376,6 +383,7 @@ Pushing a new changeset while someone cr
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 51c544a58128
(run 'hg update' to get a working copy)
$ hg -R server graph
@@ -504,6 +512,7 @@ Pushing two children on the same head, o
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets d9e379a8c432
(run 'hg update' to get a working copy)
#endif
@@ -523,6 +532,7 @@ Pushing two children on the same head, o
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets d9e379a8c432
(run 'hg update' to get a working copy)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -531,6 +541,7 @@ Pushing two children on the same head, o
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets d603e2c0cdd7
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R server graph
@@ -672,6 +683,7 @@ Pushing two children on the same head, o
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 833be552cfe6
(run 'hg heads .' to see heads, 'hg merge' to merge)
#endif
@@ -691,6 +703,7 @@ Pushing two children on the same head, o
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 833be552cfe6
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -699,6 +712,7 @@ Pushing two children on the same head, o
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 75d69cba5402
(run 'hg heads' to see heads)
$ hg -R server graph
@@ -854,6 +868,7 @@ There are multiple heads, but the racing
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 89420bf00fae
(run 'hg heads .' to see heads, 'hg merge' to merge)
#endif
@@ -874,6 +889,7 @@ There are multiple heads, but the racing
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 89420bf00fae
(run 'hg heads' to see heads)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -882,6 +898,7 @@ There are multiple heads, but the racing
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets b35ed749f288
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R server graph
@@ -999,6 +1016,7 @@ There are multiple heads, the raced push
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets cac2cead0ff0
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R ./client-other pull
pulling from ssh://user@dummy/server
@@ -1007,6 +1025,7 @@ There are multiple heads, the raced push
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets cac2cead0ff0
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -1015,6 +1034,7 @@ There are multiple heads, the raced push
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files
+ new changesets be705100c623
(run 'hg update' to get a working copy)
$ hg -R server graph
@@ -1139,6 +1159,7 @@ non-continuous branch are valid case, we
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files
+ new changesets 866a66e18630
(run 'hg update' to get a working copy)
(creates named branch on head)
@@ -1160,6 +1181,7 @@ non-continuous branch are valid case, we
adding manifests
adding file changes
added 2 changesets with 0 changes to 0 files
+ new changesets 866a66e18630:55a6f1c01b48
(run 'hg update' to get a working copy)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -1168,6 +1190,7 @@ non-continuous branch are valid case, we
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 6fd3090135df:55a6f1c01b48
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R server graph
@@ -1316,6 +1339,7 @@ non-continuous branch are valid case, we
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
+ new changesets b0ee3d6f51bc
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R ./client-other pull
pulling from ssh://user@dummy/server
@@ -1324,6 +1348,7 @@ non-continuous branch are valid case, we
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
+ new changesets b0ee3d6f51bc
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -1332,6 +1357,7 @@ non-continuous branch are valid case, we
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files (+1 heads)
+ new changesets d0a85b2252a9:1b58ee3f79e5
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R server graph
@@ -1484,6 +1510,7 @@ raced commit push a new head obsoleting
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files (+1 heads)
+ new changesets 2efd43f7b5ba:3d57ed3c1091
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R ./client-other pull
pulling from ssh://user@dummy/server
@@ -1492,6 +1519,7 @@ raced commit push a new head obsoleting
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files (+1 heads)
+ new changesets 2efd43f7b5ba:3d57ed3c1091
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -1500,6 +1528,7 @@ raced commit push a new head obsoleting
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets de7b9e2ba3f6
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R server graph
@@ -1668,6 +1697,7 @@ racing commit push a new head obsoleting
added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers
obsoleted 1 changesets
+ new changesets 720c5163ecf6
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R ./client-other pull
pulling from ssh://user@dummy/server
@@ -1678,6 +1708,7 @@ racing commit push a new head obsoleting
added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers
obsoleted 1 changesets
+ new changesets 720c5163ecf6
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R ./client-racy pull
pulling from ssh://user@dummy/server
@@ -1686,6 +1717,7 @@ racing commit push a new head obsoleting
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files
+ new changesets a98a47d8b85b
(run 'hg update' to get a working copy)
$ hg -R server debugobsolete
diff --git a/tests/test-push-warn.t b/tests/test-push-warn.t
--- a/tests/test-push-warn.t
+++ b/tests/test-push-warn.t
@@ -60,6 +60,7 @@ Specifying a revset that evaluates to nu
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 1c9246a22a0a
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg push ../a
diff --git a/tests/test-push.t b/tests/test-push.t
--- a/tests/test-push.t
+++ b/tests/test-push.t
@@ -11,6 +11,7 @@ Testing of the '--rev' flag
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
+ new changesets bfaf4b5cbf01:916f1afdef90
(run 'hg heads' to see heads, 'hg merge' to merge)
$ for i in 0 1 2 3 4 5 6 7 8; do
@@ -137,6 +138,7 @@ Testing of the '--rev' flag
adding manifests
adding file changes
added 4 changesets with 2 changes to 3 files (+1 heads)
+ new changesets c70afb1ee985:faa2e4234c7a
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg verify
diff --git a/tests/test-rebase-collapse.t b/tests/test-rebase-collapse.t
--- a/tests/test-rebase-collapse.t
+++ b/tests/test-rebase-collapse.t
@@ -20,6 +20,7 @@ Create repo a:
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
+ new changesets cd010b8cd998:02de42196ebe
(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
@@ -641,6 +642,7 @@ Rebase, collapse and copies
adding manifests
adding file changes
added 4 changesets with 11 changes to 7 files (+1 heads)
+ new changesets f447d5abf5ea:338e84e2e558
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up -q tip
$ hg tglog
diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -156,6 +156,7 @@ Check that the right ancestors is used w
adding manifests
adding file changes
added 11 changesets with 8 changes to 3 files (+1 heads)
+ new changesets 24797d4f68de:2f2496ddf49d
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd issue4041
diff --git a/tests/test-rebase-named-branches.t b/tests/test-rebase-named-branches.t
--- a/tests/test-rebase-named-branches.t
+++ b/tests/test-rebase-named-branches.t
@@ -16,6 +16,7 @@
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
+ new changesets cd010b8cd998:02de42196ebe
(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
diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t
--- a/tests/test-rebase-obsolete.t
+++ b/tests/test-rebase-obsolete.t
@@ -25,6 +25,7 @@ Setup rebase canonical repo
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
+ new changesets cd010b8cd998:02de42196ebe
(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
@@ -507,6 +508,7 @@ test on rebase dropping a merge
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
+ new changesets cd010b8cd998:02de42196ebe
(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
diff --git a/tests/test-rebase-parameters.t b/tests/test-rebase-parameters.t
--- a/tests/test-rebase-parameters.t
+++ b/tests/test-rebase-parameters.t
@@ -17,6 +17,7 @@
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
+ new changesets cd010b8cd998:02de42196ebe
(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
diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t
--- a/tests/test-rebase-pull.t
+++ b/tests/test-rebase-pull.t
@@ -54,6 +54,7 @@ Now b has one revision to be pulled from
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 77ae9631bcca
rebasing 2:ff8d69a621f9 "L1"
saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob)
@@ -143,6 +144,7 @@ Invoke pull --rebase and nothing to reba
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 77ae9631bcca
nothing to rebase - updating instead
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updating bookmark norebase
@@ -210,6 +212,7 @@ pull --rebase works when a specific revi
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets 31cd3a05214e:770a61882ace
rebasing 3:ff8d69a621f9 "L1"
saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob)
$ hg tglog
@@ -252,6 +255,7 @@ pull --rebase works with bundle2 turned
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 00e3b7781125
rebasing 5:518d153c0ba3 "L1"
saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14-rebase.hg (glob)
$ hg tglog
@@ -304,6 +308,7 @@ pull --rebase only update if there is no
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 88dd24261747
rebasing 6:0d0727eb7ce0 "L1"
rebasing 7:c1f58876e3bf "L2"
saved backup bundle to $TESTTMP/c/.hg/strip-backup/0d0727eb7ce0-ef61ccb2-rebase.hg (glob)
@@ -345,6 +350,7 @@ pull --rebase update (no rebase) use pro
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 65bc164c1d9b
nothing to rebase - updating instead
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "65bc164c1d9b: R6"
@@ -394,6 +400,7 @@ pre-existing heads.
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 39c381359968
nothing to rebase
There is two local heads and we pull a third one.
@@ -420,6 +427,7 @@ The second local head should not confuse
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets f7d3e42052f9
rebasing 7:864e0a2d2614 "L1"
rebasing 8:6dc0ea5dcf55 "L2"
saved backup bundle to $TESTTMP/c/.hg/strip-backup/864e0a2d2614-2f72c89c-rebase.hg (glob)
diff --git a/tests/test-rebase-scenario-global.t b/tests/test-rebase-scenario-global.t
--- a/tests/test-rebase-scenario-global.t
+++ b/tests/test-rebase-scenario-global.t
@@ -18,6 +18,7 @@
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
+ new changesets cd010b8cd998:02de42196ebe
(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
@@ -420,6 +421,7 @@ All destination are B
adding manifests
adding file changes
added 9 changesets with 9 changes to 9 files (+2 heads)
+ new changesets 9ae2ed22e576:479ddb54a924
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg tglog
o 8: 'I'
diff --git a/tests/test-relink.t b/tests/test-relink.t
--- a/tests/test-relink.t
+++ b/tests/test-relink.t
@@ -60,6 +60,7 @@ clone and pull to break links
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 008c0c271c47
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd clone
diff --git a/tests/test-rename-after-merge.t b/tests/test-rename-after-merge.t
--- a/tests/test-rename-after-merge.t
+++ b/tests/test-rename-after-merge.t
@@ -35,6 +35,7 @@ Merge repositories:
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets d2ae7f538514
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg merge
diff --git a/tests/test-rename-dir-merge.t b/tests/test-rename-dir-merge.t
--- a/tests/test-rename-dir-merge.t
+++ b/tests/test-rename-dir-merge.t
@@ -218,6 +218,7 @@ Second scenario with two repos:
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 7d51ed18da25
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg merge
diff --git a/tests/test-rollback.t b/tests/test-rollback.t
--- a/tests/test-rollback.t
+++ b/tests/test-rollback.t
@@ -134,6 +134,7 @@ test rollback on served repository
adding manifests
adding file changes
added 3 changesets with 2 changes to 1 files (+1 heads)
+ new changesets 23b0221f3370:068774709090
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd u
diff --git a/tests/test-setdiscovery.t b/tests/test-setdiscovery.t
--- a/tests/test-setdiscovery.t
+++ b/tests/test-setdiscovery.t
@@ -294,6 +294,7 @@ One with >200 heads, which used to use u
adding manifests
adding file changes
added 1340 changesets with 0 changes to 0 files (+259 heads)
+ new changesets 1ea73414a91b:1c51e2c80832
updating to branch a
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg clone -b b . b
@@ -301,6 +302,7 @@ One with >200 heads, which used to use u
adding manifests
adding file changes
added 304 changesets with 0 changes to 0 files
+ new changesets 1ea73414a91b:513314ca8b3a
updating to branch b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -1088,6 +1088,7 @@ no general delta
adding manifests
adding file changes
added 5 changesets with 8 changes to 6 files
+ new changesets cc01e2b0c59f:33f7f61e6c5e
updating to branch default
6 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd bundle1
@@ -1108,6 +1109,7 @@ with general delta
adding manifests
adding file changes
added 5 changesets with 8 changes to 6 files
+ new changesets cc01e2b0c59f:33f7f61e6c5e
updating to branch default
6 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd bundle2
diff --git a/tests/test-simple-update.t b/tests/test-simple-update.t
--- a/tests/test-simple-update.t
+++ b/tests/test-simple-update.t
@@ -30,6 +30,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 30aff43faee1
(run 'hg update' to get a working copy)
$ hg verify
diff --git a/tests/test-ssh-bundle1.t b/tests/test-ssh-bundle1.t
--- a/tests/test-ssh-bundle1.t
+++ b/tests/test-ssh-bundle1.t
@@ -102,6 +102,7 @@ clone remote via pull
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
+ new changesets 1160648e36ce:ad076bfb429d
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -313,6 +314,7 @@ clone bookmarks
adding manifests
adding file changes
added 6 changesets with 5 changes to 4 files (+1 heads)
+ new changesets 1160648e36ce:1383141674ec
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R local-bookmarks bookmarks
@@ -400,6 +402,7 @@ Test hg-ssh in read-only mode:
adding manifests
adding file changes
added 6 changesets with 5 changes to 4 files (+1 heads)
+ new changesets 1160648e36ce:1383141674ec
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-ssh-clone-r.t b/tests/test-ssh-clone-r.t
--- a/tests/test-ssh-clone-r.t
+++ b/tests/test-ssh-clone-r.t
@@ -9,6 +9,7 @@ creating 'remote' repo
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
+ new changesets bfaf4b5cbf01:916f1afdef90
(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,6 +28,7 @@ clone remote via stream
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets bfaf4b5cbf01
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -38,6 +40,7 @@ clone remote via stream
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets bfaf4b5cbf01:21f32785131f
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -49,6 +52,7 @@ clone remote via stream
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
+ new changesets bfaf4b5cbf01:4ce51a113780
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -60,6 +64,7 @@ clone remote via stream
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
+ new changesets bfaf4b5cbf01:93ee6ab32777
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -71,6 +76,7 @@ clone remote via stream
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets bfaf4b5cbf01:c70afb1ee985
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -82,6 +88,7 @@ clone remote via stream
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
+ new changesets bfaf4b5cbf01:f03ae5a9b979
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -93,6 +100,7 @@ clone remote via stream
adding manifests
adding file changes
added 4 changesets with 5 changes to 2 files
+ new changesets bfaf4b5cbf01:095cb14b1b4d
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -104,6 +112,7 @@ clone remote via stream
adding manifests
adding file changes
added 5 changesets with 6 changes to 3 files
+ new changesets bfaf4b5cbf01:faa2e4234c7a
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -115,6 +124,7 @@ clone remote via stream
adding manifests
adding file changes
added 5 changesets with 5 changes to 2 files
+ new changesets bfaf4b5cbf01:916f1afdef90
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
@@ -130,6 +140,7 @@ clone remote via stream
adding manifests
adding file changes
added 4 changesets with 2 changes to 3 files (+1 heads)
+ new changesets c70afb1ee985:faa2e4234c7a
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg verify
checking changesets
@@ -146,6 +157,7 @@ clone remote via stream
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
+ new changesets c70afb1ee985
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg verify
checking changesets
@@ -160,6 +172,7 @@ clone remote via stream
adding manifests
adding file changes
added 6 changesets with 5 changes to 4 files
+ new changesets 4ce51a113780:916f1afdef90
(run 'hg update' to get a working copy)
$ cd ..
$ cd test-2
@@ -170,6 +183,7 @@ clone remote via stream
adding manifests
adding file changes
added 2 changesets with 0 changes to 0 files (+1 heads)
+ new changesets c70afb1ee985:f03ae5a9b979
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg verify
checking changesets
@@ -184,6 +198,7 @@ clone remote via stream
adding manifests
adding file changes
added 4 changesets with 4 changes to 4 files
+ new changesets 93ee6ab32777:916f1afdef90
(run 'hg update' to get a working copy)
$ hg verify
checking changesets
diff --git a/tests/test-ssh.t b/tests/test-ssh.t
--- a/tests/test-ssh.t
+++ b/tests/test-ssh.t
@@ -96,6 +96,7 @@ clone remote via pull
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
+ new changesets 1160648e36ce:ad076bfb429d
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -317,6 +318,7 @@ clone bookmarks
adding manifests
adding file changes
added 6 changesets with 5 changes to 4 files (+1 heads)
+ new changesets 1160648e36ce:1383141674ec
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R local-bookmarks bookmarks
@@ -417,6 +419,7 @@ Test hg-ssh in read-only mode:
adding manifests
adding file changes
added 6 changesets with 5 changes to 4 files (+1 heads)
+ new changesets 1160648e36ce:1383141674ec
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-static-http.t b/tests/test-static-http.t
--- a/tests/test-static-http.t
+++ b/tests/test-static-http.t
@@ -33,6 +33,7 @@ one pull
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 02770d679fb8
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd local
@@ -64,6 +65,7 @@ check for HTTP opener failures when cach
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 4ac2e3648604
changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=4ac2e3648604439c580c69b09ec9d93a88d93432 HG_NODE_LAST=4ac2e3648604439c580c69b09ec9d93a88d93432 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT/remote
(run 'hg update' to get a working copy)
@@ -89,6 +91,7 @@ trying clone -r
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 02770d679fb8
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -110,6 +113,7 @@ test with "/" URI (issue747) and subrepo
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
+ new changesets a9ebfbe8e587
updating to branch default
cloning subrepo sub from static-http://localhost:$HGPORT/sub
requesting all changes
@@ -117,6 +121,7 @@ test with "/" URI (issue747) and subrepo
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets be090ea66256:322ea90975df
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd local2
$ hg verify
@@ -182,6 +187,7 @@ Clone with tags and branches works
adding manifests
adding file changes
added 5 changesets with 5 changes to 2 files (+1 heads)
+ new changesets 68986213bd44:0c325bd2b5a7
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -192,6 +198,7 @@ Clone a specific branch works
adding manifests
adding file changes
added 4 changesets with 4 changes to 2 files
+ new changesets 68986213bd44:0c325bd2b5a7
updating to branch mybranch
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -202,6 +209,7 @@ Clone a specific tag works
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets 68986213bd44:4ee3fcef1c80
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-strip.t b/tests/test-strip.t
--- a/tests/test-strip.t
+++ b/tests/test-strip.t
@@ -223,6 +223,7 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
+ new changesets 264128213d29
(run 'hg heads' to see heads, 'hg merge' to merge)
$ rm .hg/strip-backup/*
$ hg log --graph
diff --git a/tests/test-subrepo-deep-nested-change.t b/tests/test-subrepo-deep-nested-change.t
--- a/tests/test-subrepo-deep-nested-change.t
+++ b/tests/test-subrepo-deep-nested-change.t
@@ -104,6 +104,7 @@ are also available as siblings of 'main'
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
+ new changesets 7f491f53a367
updating to branch default
abort: HTTP Error 404: Not Found
[255]
diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
--- a/tests/test-subrepo-git.t
+++ b/tests/test-subrepo-git.t
@@ -173,6 +173,7 @@ user a pulls, merges, commits
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 089416c11d73
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg merge 2>/dev/null
subrepository s diverged (local revision: 7969594, remote revision: aa84837)
diff --git a/tests/test-subrepo-recursion.t b/tests/test-subrepo-recursion.t
--- a/tests/test-subrepo-recursion.t
+++ b/tests/test-subrepo-recursion.t
@@ -269,6 +269,7 @@ Status between revisions:
adding manifests
adding file changes
added 3 changesets with 5 changes to 3 files
+ new changesets 23376cbba0d8:1326fa26d0c0
updating to branch default
cloning subrepo foo from http://localhost:$HGPORT/foo
requesting all changes
@@ -276,12 +277,14 @@ Status between revisions:
adding manifests
adding file changes
added 4 changesets with 7 changes to 3 files
+ new changesets af048e97ade2:65903cebad86
cloning subrepo foo/bar from http://localhost:$HGPORT/foo/bar (glob)
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
+ new changesets 4904098473f9:31ecbdafd357
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat clone/foo/bar/z.txt
diff --git a/tests/test-subrepo-relative-path.t b/tests/test-subrepo-relative-path.t
--- a/tests/test-subrepo-relative-path.t
+++ b/tests/test-subrepo-relative-path.t
@@ -47,6 +47,7 @@ Clone main from hgweb
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
+ new changesets fdfeeb3e979e
updating to branch default
cloning subrepo sub from http://localhost:$HGPORT/sub
requesting all changes
@@ -54,6 +55,7 @@ Clone main from hgweb
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 863c1745b441
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Checking cloned repo ids
@@ -80,6 +82,7 @@ subrepo paths with ssh urls
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
+ new changesets fdfeeb3e979e
updating to branch default
cloning subrepo sub from ssh://user@dummy/sub
requesting all changes
@@ -87,6 +90,7 @@ subrepo paths with ssh urls
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 863c1745b441
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R sshclone push -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/cloned
diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -708,6 +708,7 @@ pull
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 925c17564ef8
(run 'hg update' to get a working copy)
should pull t
@@ -737,6 +738,7 @@ should pull t
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 52c0adc0515a
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "925c17564ef8: 13"
2 other heads for branch "default"
@@ -1053,6 +1055,7 @@ Create repo without default path, pull t
adding manifests
adding file changes
added 2 changesets with 3 changes to 2 files
+ new changesets 19487b456929:be5eb94e7215
(run 'hg update' to get a working copy)
$ hg -R issue1852b update
abort: default path for subrepository not found (in subrepository "sub/repo") (glob)
@@ -1079,6 +1082,7 @@ Try the same, but with pull -u
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets 19487b456929
cloning subrepo sub/repo from issue1852a/sub/repo (glob)
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1140,6 +1144,7 @@ Check that merge of a new subrepo doesn'
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets c82b79fdcc5b
subrepository sub/repo diverged (local revision: f42d5c7504a8, remote revision: 46cd4aac504c)
(M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m
pulling subrepo sub/repo from $TESTTMP/issue1852a/sub/repo (glob)
@@ -1148,6 +1153,7 @@ Check that merge of a new subrepo doesn'
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 46cd4aac504c
subrepository sources for sub/repo differ (glob)
use (l)ocal source (f42d5c7504a8) or (r)emote source (46cd4aac504c)? l
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-symlink-os-yes-fs-no.py.out b/tests/test-symlink-os-yes-fs-no.py.out
--- a/tests/test-symlink-os-yes-fs-no.py.out
+++ b/tests/test-symlink-os-yes-fs-no.py.out
@@ -3,6 +3,7 @@ adding changesets
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
+new changesets d326ae2d01ee
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
requesting all changes
@@ -10,5 +11,6 @@ adding changesets
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
+new changesets d326ae2d01ee
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-tag.t b/tests/test-tag.t
--- a/tests/test-tag.t
+++ b/tests/test-tag.t
@@ -624,6 +624,7 @@ check that we can merge tags that differ
adding manifests
adding file changes
added 6 changesets with 6 changes to 3 files (+1 heads)
+ new changesets 9aa4e1292a27:b325cc5b642c
hook: tag changes detected
hook: +A 929bca7b18d067cbf3844c3896319a940059d748 t2
hook: +A 9aa4e1292a27a248f8d07339bed9931d54907be7 t4
diff --git a/tests/test-tags.t b/tests/test-tags.t
--- a/tests/test-tags.t
+++ b/tests/test-tags.t
@@ -669,6 +669,7 @@ Cloning should pull down hgtags fnodes m
adding manifests
adding file changes
added 4 changesets with 4 changes to 2 files
+ new changesets 96ee1d7354c4:40f0358cb314
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-transplant.t b/tests/test-transplant.t
--- a/tests/test-transplant.t
+++ b/tests/test-transplant.t
@@ -262,6 +262,7 @@ test same-parent transplant with --log
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets 17ab29e464c6:d11e3596cc1a
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ../sameparent
@@ -282,6 +283,7 @@ format-breaking diffopts
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
+ new changesets 17ab29e464c6:d11e3596cc1a
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ../remote
@@ -339,6 +341,7 @@ remote transplant with pull
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 17ab29e464c6
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ../rp
@@ -351,6 +354,7 @@ remote transplant with pull
added 1 changesets with 1 changes to 1 files
applying a53251cdf717
a53251cdf717 transplanted to 8d9279348abb
+ new changesets 37a1297eb21b:8d9279348abb
$ hg log --template '{rev} {parents} {desc}\n'
2 b3
1 b1
@@ -542,6 +546,7 @@ test transplant into empty repository
adding manifests
adding file changes
added 4 changesets with 4 changes to 4 files
+ new changesets 17ab29e464c6:a53251cdf717
test "--merge" causing pull from source repository on local host
@@ -555,6 +560,7 @@ test "--merge" causing pull from source
added 2 changesets with 2 changes to 2 files
applying a53251cdf717
4:a53251cdf717 merged at 4831f4dc831a
+ new changesets 722f4667af76:4831f4dc831a
test interactive transplant
@@ -845,6 +851,7 @@ test transplanting a patch turning into
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 07f494440405
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd binarydest
diff --git a/tests/test-treediscovery-legacy.t b/tests/test-treediscovery-legacy.t
--- a/tests/test-treediscovery-legacy.t
+++ b/tests/test-treediscovery-legacy.t
@@ -155,6 +155,7 @@ Local is empty:
adding manifests
adding file changes
added 12 changesets with 24 changes to 2 files
+ new changesets d57206cc072a:a19bfa7e7328
(run 'hg update' to get a working copy)
$ hg incoming $remote
comparing with http://localhost:$HGPORT/
@@ -171,6 +172,7 @@ Local is subset:
adding manifests
adding file changes
added 6 changesets with 12 changes to 2 files
+ new changesets d57206cc072a:d8f638ac69e9
updating to branch name2
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cp $HGRCPATH-nocap $HGRCPATH
@@ -200,6 +202,7 @@ Local is subset:
adding manifests
adding file changes
added 6 changesets with 12 changes to 2 files
+ new changesets a7892891da29:a19bfa7e7328
(run 'hg update' to get a working copy)
$ hg incoming $remote
comparing with http://localhost:$HGPORT/
@@ -258,6 +261,7 @@ Local is superset:
adding manifests
adding file changes
added 6 changesets with 12 changes to 2 files
+ new changesets d57206cc072a:d8f638ac69e9
updating to branch name2
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ tstart subset2
diff --git a/tests/test-treediscovery.t b/tests/test-treediscovery.t
--- a/tests/test-treediscovery.t
+++ b/tests/test-treediscovery.t
@@ -140,6 +140,7 @@ Local is empty:
adding manifests
adding file changes
added 12 changesets with 24 changes to 2 files
+ new changesets d57206cc072a:a19bfa7e7328
(run 'hg update' to get a working copy)
$ hg incoming $remote
comparing with http://localhost:$HGPORT/
@@ -155,6 +156,7 @@ Local is subset:
adding manifests
adding file changes
added 6 changesets with 12 changes to 2 files
+ new changesets d57206cc072a:d8f638ac69e9
updating to branch name2
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg incoming $remote
@@ -183,6 +185,7 @@ Local is subset:
adding manifests
adding file changes
added 6 changesets with 12 changes to 2 files
+ new changesets a7892891da29:a19bfa7e7328
(run 'hg update' to get a working copy)
$ hg incoming $remote
comparing with http://localhost:$HGPORT/
@@ -242,6 +245,7 @@ Local is superset:
adding manifests
adding file changes
added 6 changesets with 12 changes to 2 files
+ new changesets d57206cc072a:d8f638ac69e9
updating to branch name2
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ tstart subset2
@@ -293,6 +297,7 @@ Partial pull:
adding manifests
adding file changes
added 6 changesets with 12 changes to 2 files
+ new changesets d57206cc072a:d8f638ac69e9
updating to branch name2
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd partial
@@ -318,6 +323,7 @@ Partial pull:
adding manifests
adding file changes
added 3 changesets with 6 changes to 2 files (+1 heads)
+ new changesets a7892891da29:e71dbbc70e03
(run 'hg heads' to see heads)
$ hg incoming $remote
comparing with http://localhost:$HGPORT/
@@ -364,6 +370,7 @@ Both have new stuff in new named branche
adding manifests
adding file changes
added 3 changesets with 6 changes to 2 files (+1 heads)
+ new changesets a7892891da29:e71dbbc70e03
(run 'hg heads' to see heads)
$ hg incoming $remote
comparing with http://localhost:$HGPORT/
@@ -400,6 +407,7 @@ Both have new stuff in new named branche
adding manifests
adding file changes
added 3 changesets with 6 changes to 2 files (+1 heads)
+ new changesets a7892891da29:e71dbbc70e03
(run 'hg heads' to see heads)
$ hg push $remote --new-branch
pushing to http://localhost:$HGPORT/
@@ -453,6 +461,7 @@ Both have new stuff in existing named br
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets d8f638ac69e9
(run 'hg update' to get a working copy)
$ hg incoming $remote
comparing with http://localhost:$HGPORT/
@@ -484,6 +493,7 @@ Both have new stuff in existing named br
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ new changesets d8f638ac69e9
(run 'hg update' to get a working copy)
$ hg push $remote --new-branch
pushing to http://localhost:$HGPORT/
diff --git a/tests/test-treemanifest.t b/tests/test-treemanifest.t
--- a/tests/test-treemanifest.t
+++ b/tests/test-treemanifest.t
@@ -232,6 +232,7 @@ Create clone with tree manifests enabled
adding manifests
adding file changes
added 2 changesets with 14 changes to 11 files
+ new changesets 5b02a3e8db7e:581ef6037d8b
updating to branch default
11 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo-mixed
@@ -342,6 +343,7 @@ Stripping and recovering changes should
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 51cfd7b1e13b
(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)
@@ -654,6 +656,7 @@ We can clone even with the knob turned o
adding manifests
adding file changes
added 4 changesets with 18 changes to 8 files
+ new changesets 775704be6f52:523e5c631710
updating to branch default
8 files updated, 0 files merged, 0 files removed, 0 files unresolved
No server errors.
@@ -700,6 +703,7 @@ Create clones using old repo formats to
adding manifests
adding file changes
added 4 changesets with 18 changes to 8 files
+ new changesets 775704be6f52:523e5c631710
updating to branch default
8 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd deeprepo-basicstore
@@ -716,6 +720,7 @@ Create clones using old repo formats to
adding manifests
adding file changes
added 4 changesets with 18 changes to 8 files
+ new changesets 775704be6f52:523e5c631710
updating to branch default
8 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd deeprepo-encodedstore
@@ -845,6 +850,7 @@ other branch
adding manifests
adding file changes
added 2 changesets with 3 changes to 2 files
+ new changesets d84f4c419457:09ab742f3b0f
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd grafted-dir-repo-clone
@@ -855,6 +861,7 @@ other branch
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 73699489fb7c
(run 'hg heads' to see heads, 'hg merge' to merge)
Committing a empty commit does not duplicate root treemanifest
diff --git a/tests/test-unionrepo.t b/tests/test-unionrepo.t
--- a/tests/test-unionrepo.t
+++ b/tests/test-unionrepo.t
@@ -126,6 +126,7 @@ union repos can be cloned ... and clones
adding manifests
adding file changes
added 6 changesets with 11 changes to 6 files (+1 heads)
+ new changesets f093fec0529b:2f0d178c469c
$ hg -R repo3 paths
default = union:repo1+repo2
diff --git a/tests/test-unrelated-pull.t b/tests/test-unrelated-pull.t
--- a/tests/test-unrelated-pull.t
+++ b/tests/test-unrelated-pull.t
@@ -26,6 +26,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets 9a79c33a9db3
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg heads
diff --git a/tests/test-up-local-change.t b/tests/test-up-local-change.t
--- a/tests/test-up-local-change.t
+++ b/tests/test-up-local-change.t
@@ -224,6 +224,7 @@ test a local add
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets cb9a9f314b8b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg st
diff --git a/tests/test-update-dest.t b/tests/test-update-dest.t
--- a/tests/test-update-dest.t
+++ b/tests/test-update-dest.t
@@ -46,3 +46,4 @@ update.requiredest should silent the "hg
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets 8f0162e483d0:048c2cb95949
diff --git a/tests/test-url-rev.t b/tests/test-url-rev.t
--- a/tests/test-url-rev.t
+++ b/tests/test-url-rev.t
@@ -16,6 +16,7 @@ Test basic functionality of url#rev synt
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
+ new changesets 1f0dee641bb7:cd2a86ecc814
updating to branch foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
More information about the Mercurial-devel
mailing list