Mercurial > hg
changeset 9611:a3d73b3e1f8a
hg.clone: report branch name on update
line wrap: on
line diff
--- a/mercurial/hg.py Mon Oct 19 22:19:28 2009 +0300 +++ b/mercurial/hg.py Fri Oct 16 23:57:34 2009 +0200 @@ -307,7 +307,6 @@ dest_repo.ui.setconfig('paths', 'default', abspath) if update: - dest_repo.ui.status(_("updating working directory\n")) if update is not True: checkout = update for test in (checkout, 'default', 'tip'): @@ -318,6 +317,8 @@ break except error.RepoLookupError: continue + bn = dest_repo[uprev].branch() + dest_repo.ui.status(_("updating to branch %s\n") % bn) _update(dest_repo, uprev) return src_repo, dest_repo
--- a/tests/test-acl.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-acl.out Fri Oct 16 23:57:34 2009 +0200 @@ -4,7 +4,7 @@ adding manifests adding file changes added 1 changesets with 3 changes to 3 files -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved Extension disabled for lack of a hook
--- a/tests/test-bundle-r.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-bundle-r.out Fri Oct 16 23:57:34 2009 +0200 @@ -163,7 +163,7 @@ 6 changesets found 1 changesets found 1 changesets found -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % 2 2:d62976ca1e50 @@ -219,7 +219,7 @@ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 7 changesets found -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding changesets adding manifests
--- a/tests/test-bundle.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-bundle.out Fri Oct 16 23:57:34 2009 +0200 @@ -146,9 +146,9 @@ adding manifests adding file changes added 4 changesets with 4 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ====== Log -R full.hg in partial changeset: 8:836ac62537ab @@ -269,7 +269,7 @@ adding manifests adding file changes added 9 changesets with 7 changes to 4 files (+1 heads) -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved changeset: 8:836ac62537ab tag: tip @@ -296,7 +296,7 @@ added 1 changesets with 1 changes to 1 files 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ====== test for 540d1059c802 -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved searching for changes 1 changesets found
--- a/tests/test-clone-pull-corruption.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-clone-pull-corruption.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,4 +1,4 @@ -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../source transaction abort!
--- a/tests/test-clone-r.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-clone-r.out Fri Oct 16 23:57:34 2009 +0200 @@ -30,7 +30,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -42,7 +42,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -54,7 +54,7 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -66,7 +66,7 @@ adding manifests adding file changes added 4 changesets with 4 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -78,7 +78,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -90,7 +90,7 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -102,7 +102,7 @@ adding manifests adding file changes added 4 changesets with 5 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -114,7 +114,7 @@ adding manifests adding file changes added 5 changesets with 6 changes to 3 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -126,7 +126,7 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests
--- a/tests/test-clone.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-clone.out Fri Oct 16 23:57:34 2009 +0200 @@ -6,7 +6,7 @@ .hg/store/data/b.i % default operation -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved a checking changesets @@ -25,13 +25,13 @@ % default destination destination directory: a -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved a % check that we drop the file:// from the path before % writing the .hgrc -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved % check that path aliases are expanded @@ -43,7 +43,7 @@ adding manifests adding file changes added 11 changesets with 11 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -52,5 +52,5 @@ 2 files, 11 changesets, 11 total revisions % clone to . -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-convert-splicemap.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-convert-splicemap.out Fri Oct 16 23:57:34 2009 +0200 @@ -7,7 +7,7 @@ % test invalid splicemap abort: syntax error in splicemap(1): key/value pair expected % splice repo2 on repo1 -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved scanning source... sorting...
--- a/tests/test-default-push.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-default-push.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,7 +1,7 @@ adding a -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % push should push to default when default-push not set pushing
--- a/tests/test-empty-group.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-empty-group.out Fri Oct 16 23:57:34 2009 +0200 @@ -16,14 +16,14 @@ adding manifests adding file changes added 4 changesets with 3 changes to 3 files -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved requesting all changes adding changesets adding manifests adding file changes added 4 changesets with 3 changes to 3 files -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved comparing with b searching for changes
--- a/tests/test-empty.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-empty.out Fri Oct 16 23:57:34 2009 +0200 @@ -6,7 +6,7 @@ 00changelog.i requires store -updating working directory +updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests
--- a/tests/test-extension.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-extension.out Fri Oct 16 23:57:34 2009 +0200 @@ -7,7 +7,7 @@ ui == repo.ui reposetup called for b ui == repo.ui -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved uisetup called Bar
--- a/tests/test-fetch.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-fetch.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,8 +1,8 @@ % test fetch with default branches only adding a -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b 1:97d72e5f12c7 @@ -16,9 +16,9 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1:97d72e5f12c7 adding c -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved % should merge c into a pulling from ../a @@ -61,9 +61,9 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved new changeset 3:... merges remote changes with local Automated merge with http://localhost:20059/ -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved adding f adding g @@ -89,9 +89,9 @@ created new head % pull in change on foreign branch -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -105,9 +105,9 @@ 2 % pull in changes on both foreign and local branches -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -124,9 +124,9 @@ % pull changes on foreign (2 new heads) and local (1 new head) branches % with a local change -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -149,9 +149,9 @@ 7 % pull in changes on foreign (merge of local branch) and local (2 new % heads) with a local change -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -172,7 +172,7 @@ 3 % pull in change on different branch than dirstate adding a -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved marked working directory as branch topic abort: working dir not at branch tip (use "hg update" to check out branch tip) @@ -184,7 +184,7 @@ adding b marked working directory as branch default adding c -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved % fetch should succeed pulling from ../ib1 @@ -192,7 +192,7 @@ no changes found % test issue1726 adding a -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../i1726r1 searching for changes
--- a/tests/test-filebranch.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-filebranch.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,5 +1,5 @@ creating base -updating working directory +updating to branch default 4 files updated, 0 files merged, 0 files removed, 0 files unresolved creating branch a creating branch b
--- a/tests/test-flags.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-flags.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,4 +1,4 @@ -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../test1 requesting all changes
--- a/tests/test-globalopts.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-globalopts.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,6 +1,6 @@ adding a adding b -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../b searching for changes
--- a/tests/test-hgrc.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-hgrc.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,5 +1,5 @@ hg: config error at .../t/.hg/hgrc:1: 'invalid' -updating working directory +updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved [paths] default = .../foo%bar
--- a/tests/test-hook.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-hook.out Fri Oct 16 23:57:34 2009 +0200 @@ -3,7 +3,7 @@ 0:29b62aeb769f commit hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 commit.b hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved precommit hook: HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b pretxncommit hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PENDING=$HGTMP/test-hook/a @@ -109,7 +109,7 @@ abort: preoutgoing.forbid hook exited with status 1 preoutgoing hook: HG_SOURCE=clone outgoing hook: HG_NODE=0000000000000000000000000000000000000000 HG_SOURCE=clone -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved preoutgoing hook: HG_SOURCE=clone preoutgoing.forbid hook: HG_SOURCE=clone
--- a/tests/test-http-clone-r.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-http-clone-r.out Fri Oct 16 23:57:34 2009 +0200 @@ -33,7 +33,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -45,7 +45,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -57,7 +57,7 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -69,7 +69,7 @@ adding manifests adding file changes added 4 changesets with 4 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -81,7 +81,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -93,7 +93,7 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -105,7 +105,7 @@ adding manifests adding file changes added 4 changesets with 5 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -117,7 +117,7 @@ adding manifests adding file changes added 5 changesets with 6 changes to 3 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -129,7 +129,7 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests
--- a/tests/test-http-proxy.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-http-proxy.out Fri Oct 16 23:57:34 2009 +0200 @@ -3,7 +3,7 @@ streaming all changes XXX files to transfer, XXX bytes of data transferred XXX bytes in XXX seconds (XXX XB/sec) -updating working directory +updating to branch default XXX files updated, XXX files merged, XXX files removed, XXX files unresolved checking changesets checking manifests @@ -16,7 +16,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -29,7 +29,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved %% proxy url with user name and password requesting all changes @@ -37,7 +37,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved %% url with user name and password requesting all changes @@ -45,7 +45,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved %% bad host:port for proxy abort: error: Connection refused @@ -55,7 +55,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved XXX "GET http://localhost:/?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" - - XXX "GET http://localhost:/?cmd=capabilities HTTP/1.1" - -
--- a/tests/test-http.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-http.out Fri Oct 16 23:57:34 2009 +0200 @@ -7,7 +7,7 @@ streaming all changes XXX files to transfer, XXX bytes of data transferred XXX bytes in XXX seconds (XXX XB/sec) -updating working directory +updating to branch default XXX files updated, XXX files merged, XXX files removed, XXX files unresolved checking changesets checking manifests @@ -20,7 +20,7 @@ adding manifests adding file changes added 1 changesets with 4 changes to 4 files -updating working directory +updating to branch default 4 files updated, 0 files merged, 0 files removed, 0 files unresolved % clone via pull requesting all changes @@ -28,7 +28,7 @@ adding manifests adding file changes added 1 changesets with 4 changes to 4 files -updating working directory +updating to branch default 4 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests
--- a/tests/test-import.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-import.out Fri Oct 16 23:57:34 2009 +0200 @@ -6,7 +6,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../tip.patch % message should be same @@ -19,7 +19,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../tip.patch line2 @@ -29,7 +29,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../tip.patch abort: empty commit message @@ -39,7 +39,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../tip.patch % import of plain diff with specific date and user @@ -48,7 +48,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../tip.patch changeset: 1:ca68f19f3a40 @@ -73,7 +73,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../tip.patch diff -r 80971e65b431 a @@ -88,7 +88,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying tip.patch % import from stdin @@ -97,7 +97,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin % override commit message @@ -106,7 +106,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin summary: override @@ -116,7 +116,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../msg.patch user: email patcher @@ -127,7 +127,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin % plain diff in email, subject, no message body @@ -136,7 +136,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin % plain diff in email, no subject, no message body, should fail @@ -145,7 +145,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin abort: empty commit message @@ -155,7 +155,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin summary: second change @@ -165,7 +165,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin email patch @@ -184,7 +184,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../../../tip.patch % message should be 'subdir change'
--- a/tests/test-incoming-outgoing.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-incoming-outgoing.out Fri Oct 16 23:57:34 2009 +0200 @@ -305,7 +305,7 @@ date: Mon Jan 12 13:46:40 1970 +0000 summary: 8 -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests
--- a/tests/test-issue1306.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-issue1306.out Fri Oct 16 23:57:34 2009 +0200 @@ -26,7 +26,7 @@ adding manifests adding file changes added 3 changesets with 2 changes to 2 files -updating working directory +updating to branch br 2 files updated, 0 files merged, 0 files removed, 0 files unresolved changeset: 2:1630aed6ed2b branch: br @@ -41,7 +41,7 @@ adding manifests adding file changes added 3 changesets with 2 changes to 2 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved changeset: 0:cb9a9f314b8b user: test @@ -54,7 +54,7 @@ adding manifests adding file changes added 3 changesets with 2 changes to 2 files -updating working directory +updating to branch br 1 files updated, 0 files merged, 0 files removed, 0 files unresolved changeset: 1:234f53e6c5ff branch: br
--- a/tests/test-keyword.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-keyword.out Fri Oct 16 23:57:34 2009 +0200 @@ -280,7 +280,7 @@ adding manifests adding file changes added 2 changesets with 3 changes to 3 files -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved % incoming comparing with test-keyword/Test
--- a/tests/test-lock-badness.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-lock-badness.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,5 +1,5 @@ adding a -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b pushing to ../a
--- a/tests/test-manifest-merging.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-manifest-merging.out Fri Oct 16 23:57:34 2009 +0200 @@ -2,7 +2,7 @@ % create alpha in first repo adding alpha % clone foo-base to foo-work -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % create beta in second repo adding beta
--- a/tests/test-merge10.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-merge10.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,4 +1,4 @@ -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../a searching for changes
--- a/tests/test-merge6.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-merge6.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,8 +1,8 @@ -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../B1 searching for changes
--- a/tests/test-merge7.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-merge7.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,4 +1,4 @@ -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../test-a searching for changes
--- a/tests/test-merge8.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-merge8.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,4 +1,4 @@ -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../a searching for changes
--- a/tests/test-mq-pull-from-bundle.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-mq-pull-from-bundle.out Fri Oct 16 23:57:34 2009 +0200 @@ -18,7 +18,7 @@ ====== Bundle queue 1 changesets found ====== Clone base -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ====== Incoming queue bundle >> hg -R .hg/patches incoming ../queue.hgq @@ -41,7 +41,7 @@ >> hg qseries two.patch ====== Clone base again -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ====== Unbundle queue bundle >> hg -R .hg/patches unbundle --update ../queue.hgq
--- a/tests/test-mq-qclone-http.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-mq-qclone-http.out Fri Oct 16 23:57:34 2009 +0200 @@ -20,7 +20,7 @@ adding manifests adding file changes added 1 changesets with 3 changes to 3 files -updating working directory +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 a @@ -45,7 +45,7 @@ adding manifests adding file changes added 1 changesets with 3 changes to 3 files -updating working directory +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 a @@ -70,7 +70,7 @@ adding manifests adding file changes added 1 changesets with 3 changes to 3 files -updating working directory +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 a
--- a/tests/test-mq.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-mq.out Fri Oct 16 23:57:34 2009 +0200 @@ -56,7 +56,7 @@ use "hg -v help mq" to show aliases and global options adding a -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b/z % qinit @@ -520,7 +520,7 @@ rev 0: add foo patch repo: rev 0: checkpoint -updating working directory +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 main repo: @@ -533,7 +533,7 @@ rev 0: add foo patch repo: rev 0: checkpoint -updating working directory +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 main repo:
--- a/tests/test-mv-cp-st-diff.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-mv-cp-st-diff.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,4 +1,4 @@ -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head ** rename in working dir ** @@ -120,7 +120,7 @@ +y1 -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head ** copy in working dir ** @@ -259,7 +259,7 @@ +y1 -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head ** single rename ** @@ -396,7 +396,7 @@ +y1 -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head ** single copy ** @@ -568,7 +568,7 @@ +y1 -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head ** rename chain ** @@ -694,7 +694,7 @@ +y1 -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head ** copy chain ** @@ -937,7 +937,7 @@ +y1 -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head ** circular rename ** @@ -1061,7 +1061,7 @@ +y1 -updating working directory +updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head moving x/x to y/x
--- a/tests/test-notify-changegroup.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-notify-changegroup.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,5 +1,5 @@ % clone -updating working directory +updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved % commit adding a
--- a/tests/test-notify.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-notify.out Fri Oct 16 23:57:34 2009 +0200 @@ -61,7 +61,7 @@ % commit adding a % clone -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % commit % pull (minimal config)
--- a/tests/test-patch.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-patch.out Fri Oct 16 23:57:34 2009 +0200 @@ -5,7 +5,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../a.diff Using custom patch
--- a/tests/test-paths.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-paths.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,2 +1,2 @@ -updating working directory +updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-pull-http.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-pull-http.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,5 +1,5 @@ adding a -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % expect error, cloning not allowed abort: authorization failed
--- a/tests/test-pull-permission.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-pull-permission.out Fri Oct 16 23:57:34 2009 +0200 @@ -3,7 +3,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests
--- a/tests/test-pull-pull-corruption.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-pull-pull-corruption.out Fri Oct 16 23:57:34 2009 +0200 @@ -3,7 +3,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../source2 pulling from ../source1
--- a/tests/test-pull-update.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-pull-update.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,5 +1,5 @@ adding foo -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % should fail pulling from ../tt
--- a/tests/test-pull.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-pull.out Fri Oct 16 23:57:34 2009 +0200 @@ -9,7 +9,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests
--- a/tests/test-push-hook-lock.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-push-hook-lock.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,7 +1,7 @@ adding foo -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pushing to ../2 searching for changes
--- a/tests/test-push-http.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-push-http.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,5 +1,5 @@ adding a -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % expect ssl error pushing to http://localhost/
--- a/tests/test-push-warn.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-push-warn.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,4 +1,4 @@ -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pushing to ../a searching for changes @@ -24,7 +24,7 @@ adding file changes added 2 changesets with 1 changes to 1 files adding foo -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head @@ -127,7 +127,7 @@ % checking prepush logic does not allow silently pushing multiple new heads adding init adding a -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved adding b
--- a/tests/test-rebase-pull.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-rebase-pull.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,6 +1,6 @@ -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved % Now b has one revision to be pulled from a
--- a/tests/test-rename-after-merge.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-rename-after-merge.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,7 +1,7 @@ % create source repository adding a % fork source repository -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b % update source repository
--- a/tests/test-rename-dir-merge2.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-rename-dir-merge2.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,5 +1,5 @@ adding a/f -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved moving a/f to b/f adding a/aa/g
--- a/tests/test-revlog-group-emptyiter.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-revlog-group-emptyiter.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,7 +1,7 @@ # -- setting up base repo adding a # -- cloning base repo -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved # -- setting up cset to push 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-simple-update.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-simple-update.out Fri Oct 16 23:57:34 2009 +0200 @@ -4,7 +4,7 @@ crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../branch
--- a/tests/test-ssh-clone-r.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-ssh-clone-r.out Fri Oct 16 23:57:34 2009 +0200 @@ -32,7 +32,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -44,7 +44,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -56,7 +56,7 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -68,7 +68,7 @@ adding manifests adding file changes added 4 changesets with 4 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -80,7 +80,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -92,7 +92,7 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -104,7 +104,7 @@ adding manifests adding file changes added 4 changesets with 5 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -116,7 +116,7 @@ adding manifests adding file changes added 5 changesets with 6 changes to 3 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -128,7 +128,7 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests
--- a/tests/test-ssh.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-ssh.out Fri Oct 16 23:57:34 2009 +0200 @@ -6,7 +6,7 @@ streaming all changes XXX files to transfer, XXX bytes of data transferred XXX bytes in XXX seconds (XXX XB/sec) -updating working directory +updating to branch default XXX files updated, XXX files merged, XXX files removed, XXX files unresolved checking changesets checking manifests @@ -19,7 +19,7 @@ adding manifests adding file changes added 1 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved # verify checking changesets
--- a/tests/test-static-http.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-static-http.out Fri Oct 16 23:57:34 2009 +0200 @@ -12,7 +12,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -39,7 +39,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -50,7 +50,7 @@ default = static-http://localhost/ % test with empty repo (issue965) no changes found -updating working directory +updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests
--- a/tests/test-subrepo.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-subrepo.out Fri Oct 16 23:57:34 2009 +0200 @@ -97,7 +97,7 @@ t3 >>>>>>> other % clone -updating working directory +updating to branch default pulling subrepo s requesting all changes adding changesets
--- a/tests/test-symlink-os-yes-fs-no.py.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-symlink-os-yes-fs-no.py.out Fri Oct 16 23:57:34 2009 +0200 @@ -3,5 +3,5 @@ adding manifests adding file changes added 1 changesets with 4 changes to 4 files -updating working directory +updating to branch default 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-symlinks.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-symlinks.out Fri Oct 16 23:57:34 2009 +0200 @@ -19,7 +19,7 @@ ? a/b/c/demo adding a/b/c/demo 2. clone it -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved # git symlink diff diff --git a/a/b/c/demo b/a/b/c/demo
--- a/tests/test-transplant.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-transplant.out Fri Oct 16 23:57:34 2009 +0200 @@ -10,7 +10,7 @@ 2 0:17ab29e464c6 b1 1 r2 0 r1 -updating working directory +updating to branch default 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 3 files removed, 0 files unresolved % rebase b onto r1 @@ -28,7 +28,7 @@ 2 0:17ab29e464c6 b1 1 r2 0 r1 -updating working directory +updating to branch default 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 3 files removed, 0 files unresolved % rebase b onto r1, skipping b2 @@ -49,7 +49,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files -updating working directory +updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved searching for changes applying 37a1297eb21b @@ -75,7 +75,7 @@ 0 r1 % skip local changes transplanted to the source adding b4 -updating working directory +updating to branch default 4 files updated, 0 files merged, 0 files removed, 0 files unresolved searching for changes applying 4333daefcb15 @@ -86,7 +86,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved searching for changes searching for changes
--- a/tests/test-up-local-change.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-up-local-change.out Fri Oct 16 23:57:34 2009 +0200 @@ -1,5 +1,5 @@ adding a -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved diff -r 33aaa84a386b a
--- a/tests/test-url-rev.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-url-rev.out Fri Oct 16 23:57:34 2009 +0200 @@ -5,7 +5,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -updating working directory +updating to branch foo 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % heads changeset: 1:cd2a86ecc814
--- a/tests/test-win32text.out Mon Oct 19 22:19:28 2009 +0300 +++ b/tests/test-win32text.out Fri Oct 16 23:57:34 2009 +0200 @@ -4,7 +4,7 @@ commit should succeed -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved commit should fail Attempt to commit or push text file(s) using CRLF line endings @@ -113,7 +113,7 @@ -updating working directory +updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding dupe/a