diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -243,6 +243,7 @@ def clone(ui, source, dest=None, pull=Fa fp.close() if update: + dest_repo.ui.status(_("updating working directory\n")) if not checkout: try: checkout = dest_repo.lookup("default") diff --git a/tests/test-acl.out b/tests/test-acl.out --- a/tests/test-acl.out +++ b/tests/test-acl.out @@ -4,6 +4,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 3 changes to 3 files +updating working directory 3 files updated, 0 files merged, 0 files removed, 0 files unresolved Extension disabled for lack of a hook diff --git a/tests/test-bundle-r.out b/tests/test-bundle-r.out --- a/tests/test-bundle-r.out +++ b/tests/test-bundle-r.out @@ -163,6 +163,7 @@ 4 changesets found 6 changesets found 1 changesets found 1 changesets found +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % 2 2:d62976ca1e50 @@ -218,6 +219,7 @@ warning: detected divergent renames of a 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 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding changesets adding manifests diff --git a/tests/test-bundle.out b/tests/test-bundle.out --- a/tests/test-bundle.out +++ b/tests/test-bundle.out @@ -146,7 +146,9 @@ adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ====== Log -R full.hg in partial changeset: 8:836ac62537ab @@ -267,6 +269,7 @@ adding changesets adding manifests adding file changes added 9 changesets with 7 changes to 4 files (+1 heads) +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved changeset: 8:836ac62537ab tag: tip @@ -293,6 +296,7 @@ adding file changes 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 1 files updated, 0 files merged, 0 files removed, 0 files unresolved searching for changes 1 changesets found diff --git a/tests/test-clone-pull-corruption.out b/tests/test-clone-pull-corruption.out --- a/tests/test-clone-pull-corruption.out +++ b/tests/test-clone-pull-corruption.out @@ -1,3 +1,4 @@ +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../source transaction abort! diff --git a/tests/test-clone-r.out b/tests/test-clone-r.out --- a/tests/test-clone-r.out +++ b/tests/test-clone-r.out @@ -30,6 +30,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -41,6 +42,7 @@ adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -52,6 +54,7 @@ adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -63,6 +66,7 @@ adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -74,6 +78,7 @@ adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -85,6 +90,7 @@ adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -96,6 +102,7 @@ adding changesets adding manifests adding file changes added 4 changesets with 5 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -107,6 +114,7 @@ adding changesets adding manifests adding file changes added 5 changesets with 6 changes to 3 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -118,6 +126,7 @@ adding changesets adding manifests adding file changes added 5 changesets with 5 changes to 2 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests diff --git a/tests/test-clone.out b/tests/test-clone.out --- a/tests/test-clone.out +++ b/tests/test-clone.out @@ -1,3 +1,4 @@ +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved a checking changesets @@ -12,7 +13,9 @@ crosschecking files in changesets and ma checking files 1 files, 1 changesets, 1 total revisions destination directory: a +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved a +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved a#0 diff --git a/tests/test-convert-hg-svn.out b/tests/test-convert-hg-svn.out --- a/tests/test-convert-hg-svn.out +++ b/tests/test-convert-hg-svn.out @@ -19,6 +19,7 @@ scanning source... sorting... converting... % new hg rev +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % echo hg to svn scanning source... diff --git a/tests/test-default-push.out b/tests/test-default-push.out --- a/tests/test-default-push.out +++ b/tests/test-default-push.out @@ -1,5 +1,7 @@ adding a +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % push should push to default when default-push not set pushing diff --git a/tests/test-empty-group.out b/tests/test-empty-group.out --- a/tests/test-empty-group.out +++ b/tests/test-empty-group.out @@ -16,12 +16,14 @@ adding changesets adding manifests adding file changes added 4 changesets with 3 changes to 3 files +updating working directory 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 3 files updated, 0 files merged, 0 files removed, 0 files unresolved comparing with b searching for changes diff --git a/tests/test-extension.out b/tests/test-extension.out --- a/tests/test-extension.out +++ b/tests/test-extension.out @@ -9,6 +9,7 @@ reposetup called for a ui == repo.ui reposetup called for b ui == repo.ui +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved uisetup called ui.parentui is None diff --git a/tests/test-fetch.out b/tests/test-fetch.out --- a/tests/test-fetch.out +++ b/tests/test-fetch.out @@ -1,5 +1,7 @@ adding a +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b 1:97d72e5f12c7 @@ -13,7 +15,9 @@ added 1 changesets with 1 changes to 1 f 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1:97d72e5f12c7 adding c +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved % should merge c into a pulling from ../a @@ -56,7 +60,9 @@ merging with 1:5e056962225c 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 2 files updated, 0 files merged, 0 files removed, 0 files unresolved +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved adding f adding g diff --git a/tests/test-filebranch.out b/tests/test-filebranch.out --- a/tests/test-filebranch.out +++ b/tests/test-filebranch.out @@ -1,4 +1,5 @@ creating base +updating working directory 4 files updated, 0 files merged, 0 files removed, 0 files unresolved creating branch a creating branch b diff --git a/tests/test-flags.out b/tests/test-flags.out --- a/tests/test-flags.out +++ b/tests/test-flags.out @@ -1,3 +1,4 @@ +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../test1 requesting all changes diff --git a/tests/test-globalopts.out b/tests/test-globalopts.out --- a/tests/test-globalopts.out +++ b/tests/test-globalopts.out @@ -1,5 +1,6 @@ adding a adding b +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../b searching for changes diff --git a/tests/test-hook.out b/tests/test-hook.out --- a/tests/test-hook.out +++ b/tests/test-hook.out @@ -3,6 +3,7 @@ pretxncommit hook: HG_NODE=29b62aeb769fd 0:29b62aeb769f commit hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 commit.b hook: HG_NODE=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b HG_PARENT1=0000000000000000000000000000000000000000 +updating working directory 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 diff --git a/tests/test-http-clone-r.out b/tests/test-http-clone-r.out --- a/tests/test-http-clone-r.out +++ b/tests/test-http-clone-r.out @@ -33,6 +33,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -44,6 +45,7 @@ adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -55,6 +57,7 @@ adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -66,6 +69,7 @@ adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -77,6 +81,7 @@ adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -88,6 +93,7 @@ adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -99,6 +105,7 @@ adding changesets adding manifests adding file changes added 4 changesets with 5 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -110,6 +117,7 @@ adding changesets adding manifests adding file changes added 5 changesets with 6 changes to 3 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -121,6 +129,7 @@ adding changesets adding manifests adding file changes added 5 changesets with 5 changes to 2 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests diff --git a/tests/test-http-proxy.out b/tests/test-http-proxy.out --- a/tests/test-http-proxy.out +++ b/tests/test-http-proxy.out @@ -3,6 +3,7 @@ adding a streaming all changes XXX files to transfer, XXX bytes of data transferred XXX bytes in XXX seconds (XXX XB/sec) +updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved checking changesets checking manifests @@ -15,6 +16,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -27,6 +29,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved %% proxy url with user name and password requesting all changes @@ -34,6 +37,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved %% url with user name and password requesting all changes @@ -41,6 +45,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved %% bad host:port for proxy abort: error: Connection refused diff --git a/tests/test-http.out b/tests/test-http.out --- a/tests/test-http.out +++ b/tests/test-http.out @@ -4,6 +4,7 @@ abort: cannot start server at ':20060': streaming all changes XXX files to transfer, XXX bytes of data transferred XXX bytes in XXX seconds (XXX XB/sec) +updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved checking changesets checking manifests @@ -16,6 +17,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % clone via pull requesting all changes @@ -23,6 +25,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests diff --git a/tests/test-import.out b/tests/test-import.out --- a/tests/test-import.out +++ b/tests/test-import.out @@ -6,6 +6,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../tip.patch % message should be same @@ -18,6 +19,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../tip.patch transaction abort! @@ -29,6 +31,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../tip.patch % import of plain diff with specific date and user @@ -37,6 +40,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../tip.patch changeset: 1:ca68f19f3a40 @@ -61,6 +65,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../tip.patch diff -r 80971e65b431 a @@ -75,6 +80,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying tip.patch % import from stdin @@ -83,6 +89,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin % override commit message @@ -91,6 +98,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin summary: override @@ -100,6 +108,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../msg.patch user: email patcher @@ -110,6 +119,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin % plain diff in email, subject, no message body @@ -118,6 +128,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files +updating working directory 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 @@ -126,6 +137,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin transaction abort! @@ -137,6 +149,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin summary: second change @@ -146,6 +159,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying patch from stdin email patch @@ -164,6 +178,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../../../tip.patch % message should be 'subdir change' diff --git a/tests/test-incoming-outgoing.out b/tests/test-incoming-outgoing.out --- a/tests/test-incoming-outgoing.out +++ b/tests/test-incoming-outgoing.out @@ -279,6 +279,7 @@ user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 8 +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests diff --git a/tests/test-keyword.out b/tests/test-keyword.out --- a/tests/test-keyword.out +++ b/tests/test-keyword.out @@ -312,6 +312,7 @@ adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 3 files +updating working directory 3 files updated, 0 files merged, 0 files removed, 0 files unresolved % incoming comparing with test-keyword/Test diff --git a/tests/test-lock-badness.out b/tests/test-lock-badness.out --- a/tests/test-lock-badness.out +++ b/tests/test-lock-badness.out @@ -1,4 +1,5 @@ adding a +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b pushing to ../a diff --git a/tests/test-manifest-merging.out b/tests/test-manifest-merging.out --- a/tests/test-manifest-merging.out +++ b/tests/test-manifest-merging.out @@ -2,6 +2,7 @@ % create alpha in first repo adding alpha % clone foo-base to foo-work +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % create beta in second repo adding beta diff --git a/tests/test-merge10.out b/tests/test-merge10.out --- a/tests/test-merge10.out +++ b/tests/test-merge10.out @@ -1,3 +1,4 @@ +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../a searching for changes diff --git a/tests/test-merge6.out b/tests/test-merge6.out --- a/tests/test-merge6.out +++ b/tests/test-merge6.out @@ -1,5 +1,8 @@ +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../B1 searching for changes diff --git a/tests/test-merge7.out b/tests/test-merge7.out --- a/tests/test-merge7.out +++ b/tests/test-merge7.out @@ -1,3 +1,4 @@ +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../test-a searching for changes diff --git a/tests/test-merge8.out b/tests/test-merge8.out --- a/tests/test-merge8.out +++ b/tests/test-merge8.out @@ -1,3 +1,4 @@ +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../a searching for changes diff --git a/tests/test-mq-pull-from-bundle.out b/tests/test-mq-pull-from-bundle.out --- a/tests/test-mq-pull-from-bundle.out +++ b/tests/test-mq-pull-from-bundle.out @@ -17,6 +17,7 @@ Patch queue now empty ====== Bundle queue 1 changesets found ====== Clone base +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ====== Incoming queue bundle >> hg -R .hg/patches incoming ../queue.hgq @@ -39,6 +40,7 @@ 0: queue: two.patch added. >> hg qseries two.patch ====== Clone base again +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ====== Unbundle queue bundle >> hg -R .hg/patches unbundle --update ../queue.hgq diff --git a/tests/test-mq-qclone-http.out b/tests/test-mq-qclone-http.out --- a/tests/test-mq-qclone-http.out +++ b/tests/test-mq-qclone-http.out @@ -19,6 +19,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 3 changes to 3 files +updating working directory 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 diff --git a/tests/test-mq.out b/tests/test-mq.out --- a/tests/test-mq.out +++ b/tests/test-mq.out @@ -52,6 +52,7 @@ list of commands: use "hg -v help mq" to show aliases and global options adding a +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b/z % qinit @@ -457,6 +458,7 @@ main repo: rev 0: add foo patch repo: rev 0: checkpoint +updating working directory 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: @@ -468,6 +470,7 @@ main repo: rev 0: add foo patch repo: rev 0: checkpoint +updating working directory 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: diff --git a/tests/test-notify.out b/tests/test-notify.out --- a/tests/test-notify.out +++ b/tests/test-notify.out @@ -4,6 +4,7 @@ no commands defined % commit adding a % clone +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % commit % pull (minimal config) diff --git a/tests/test-patch.out b/tests/test-patch.out --- a/tests/test-patch.out +++ b/tests/test-patch.out @@ -5,6 +5,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../a.diff Using custom patch diff --git a/tests/test-paths.out b/tests/test-paths.out --- a/tests/test-paths.out +++ b/tests/test-paths.out @@ -1,1 +1,2 @@ +updating working directory 0 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-pull-permission.out b/tests/test-pull-permission.out --- a/tests/test-pull-permission.out +++ b/tests/test-pull-permission.out @@ -3,6 +3,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests diff --git a/tests/test-pull-pull-corruption.out b/tests/test-pull-pull-corruption.out --- a/tests/test-pull-pull-corruption.out +++ b/tests/test-pull-pull-corruption.out @@ -3,6 +3,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../source2 pulling from ../source1 diff --git a/tests/test-pull-update.out b/tests/test-pull-update.out --- a/tests/test-pull-update.out +++ b/tests/test-pull-update.out @@ -1,4 +1,5 @@ adding foo +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % should fail pulling from ../tt diff --git a/tests/test-pull.out b/tests/test-pull.out --- a/tests/test-pull.out +++ b/tests/test-pull.out @@ -9,6 +9,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests diff --git a/tests/test-push-hook-lock.out b/tests/test-push-hook-lock.out --- a/tests/test-push-hook-lock.out +++ b/tests/test-push-hook-lock.out @@ -1,5 +1,7 @@ adding foo +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pushing to ../2 searching for changes diff --git a/tests/test-push-http.out b/tests/test-push-http.out --- a/tests/test-push-http.out +++ b/tests/test-push-http.out @@ -1,4 +1,5 @@ adding a +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % expect ssl error pushing to http://localhost/ diff --git a/tests/test-push-warn.out b/tests/test-push-warn.out --- a/tests/test-push-warn.out +++ b/tests/test-push-warn.out @@ -1,3 +1,4 @@ +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pushing to ../a searching for changes @@ -23,6 +24,7 @@ adding manifests adding file changes added 2 changesets with 1 changes to 1 files adding foo +updating working directory 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 diff --git a/tests/test-remove.out b/tests/test-remove.out --- a/tests/test-remove.out +++ b/tests/test-remove.out @@ -63,4 +63,5 @@ R b removing c/d R b R c/d +updating working directory 3 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-rename-after-merge.out b/tests/test-rename-after-merge.out --- a/tests/test-rename-after-merge.out +++ b/tests/test-rename-after-merge.out @@ -1,6 +1,7 @@ % create source repository adding a % fork source repository +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b % update source repository diff --git a/tests/test-rename-dir-merge2.out b/tests/test-rename-dir-merge2.out --- a/tests/test-rename-dir-merge2.out +++ b/tests/test-rename-dir-merge2.out @@ -1,4 +1,5 @@ adding a/f +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved moving a/f to b/f adding a/aa/g diff --git a/tests/test-simple-update.out b/tests/test-simple-update.out --- a/tests/test-simple-update.out +++ b/tests/test-simple-update.out @@ -4,6 +4,7 @@ checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions +updating working directory 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 diff --git a/tests/test-ssh-clone-r.out b/tests/test-ssh-clone-r.out --- a/tests/test-ssh-clone-r.out +++ b/tests/test-ssh-clone-r.out @@ -32,6 +32,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -43,6 +44,7 @@ adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -54,6 +56,7 @@ adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -65,6 +68,7 @@ adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -76,6 +80,7 @@ adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -87,6 +92,7 @@ adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -98,6 +104,7 @@ adding changesets adding manifests adding file changes added 4 changesets with 5 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -109,6 +116,7 @@ adding changesets adding manifests adding file changes added 5 changesets with 6 changes to 3 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -120,6 +128,7 @@ adding changesets adding manifests adding file changes added 5 changesets with 5 changes to 2 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests diff --git a/tests/test-ssh.out b/tests/test-ssh.out --- a/tests/test-ssh.out +++ b/tests/test-ssh.out @@ -6,6 +6,7 @@ abort: no suitable response from remote streaming all changes XXX files to transfer, XXX bytes of data transferred XXX bytes in XXX seconds (XXX XB/sec) +updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved checking changesets checking manifests @@ -18,6 +19,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 2 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved # verify checking changesets diff --git a/tests/test-static-http.out b/tests/test-static-http.out --- a/tests/test-static-http.out +++ b/tests/test-static-http.out @@ -12,6 +12,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -34,6 +35,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests @@ -44,6 +46,7 @@ a default = static-http://localhost/ % test with empty repo (issue965) no changes found +updating working directory 0 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests diff --git a/tests/test-symlinks.out b/tests/test-symlinks.out --- a/tests/test-symlinks.out +++ b/tests/test-symlinks.out @@ -19,6 +19,7 @@ 1. commit a symlink ? a/b/c/demo adding a/b/c/demo 2. clone it +updating working directory 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 diff --git a/tests/test-transplant.out b/tests/test-transplant.out --- a/tests/test-transplant.out +++ b/tests/test-transplant.out @@ -10,6 +10,7 @@ 3 b2 2 0:17ab29e464c6 b1 1 r2 0 r1 +updating working directory 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 @@ -27,6 +28,7 @@ 3 b2 2 0:17ab29e464c6 b1 1 r2 0 r1 +updating working directory 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 @@ -47,6 +49,7 @@ adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files +updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved searching for changes applying 37a1297eb21b @@ -72,6 +75,7 @@ 1 r2 0 r1 % skip local changes transplanted to the source adding b4 +updating working directory 4 files updated, 0 files merged, 0 files removed, 0 files unresolved searching for changes applying 4333daefcb15 @@ -82,6 +86,7 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved searching for changes searching for changes diff --git a/tests/test-up-local-change.out b/tests/test-up-local-change.out --- a/tests/test-up-local-change.out +++ b/tests/test-up-local-change.out @@ -1,4 +1,5 @@ adding a +updating working directory 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 diff --git a/tests/test-url-rev.out b/tests/test-url-rev.out --- a/tests/test-url-rev.out +++ b/tests/test-url-rev.out @@ -5,6 +5,7 @@ adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % heads changeset: 1:cd2a86ecc814 diff --git a/tests/test-win32text.out b/tests/test-win32text.out --- a/tests/test-win32text.out +++ b/tests/test-win32text.out @@ -44,6 +44,7 @@ 1 +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding dupe/a