Mercurial > hg > hg-git

changeset 265:5790ef252511

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update test expectations for hg change a3d73b3e1f8a
author Augie Fackler <durin42@gmail.com>
date Tue, 27 Oct 2009 22:40:11 -0400
parents 3caa2ce52cd9
children 5347d8c94021 d32590df65ef
files tests/test-empty-working-tree.out tests/test-encoding.out tests/test-file-removal.out tests/test-git-clone.out tests/test-git-tags.out tests/test-hg-author.out tests/test-hg-branch.out tests/test-hg-tags.out tests/test-merge.out tests/test-octopus.out tests/test-outgoing.out tests/test-pull.out tests/test-push.out tests/test-sane-without-bookmarks.out tests/test-tree-decomposition.out
diffstat 15 files changed, 19 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-empty-working-tree.out
+++ b/tests/test-empty-working-tree.out
@@ -8,7 +8,7 @@
 Total 2 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 at: 0/1
-updating working directory
+updating to branch default
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 files: 
 clearing out the git cache data
--- a/tests/test-encoding.out
+++ b/tests/test-encoding.out
@@ -14,7 +14,7 @@
 Total 12 (delta 1), reused 0 (delta 0)
 importing Git objects into Hg
 at: 0/4
-updating working directory
+updating to branch default
 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   3:8549ee7fe0801b2dafc06047ca6f66d36da709f5
 |  tag:         master
--- a/tests/test-file-removal.out
+++ b/tests/test-file-removal.out
@@ -12,7 +12,7 @@
 Total 14 (delta 1), reused 0 (delta 0)
 importing Git objects into Hg
 at: 0/5
-updating working directory
+updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   4:ea41a3f0ed10
 |  tag:         master
--- a/tests/test-git-clone.out
+++ b/tests/test-git-clone.out
@@ -6,7 +6,7 @@
 Total 6 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 at: 0/2
-updating working directory
+updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:7bcd915dc873
 |  tag:         master
--- a/tests/test-git-tags.out
+++ b/tests/test-git-tags.out
@@ -6,7 +6,7 @@
 Total 7 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 at: 0/3
-updating working directory
+updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:99dcc15b7b07
 |  tag:         default/master
--- a/tests/test-hg-author.out
+++ b/tests/test-hg-author.out
@@ -5,7 +5,7 @@
 Total 3 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 at: 0/1
-updating working directory
+updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pushing to git://localhost/gitrepo
 importing Hg objects into Git
@@ -41,7 +41,7 @@
 Total 9 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 at: 0/3
-updating working directory
+updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   2:92d33c0dd6e1
 |  tag:         master
--- a/tests/test-hg-branch.out
+++ b/tests/test-hg-branch.out
@@ -5,7 +5,7 @@
 Total 3 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 at: 0/1
-updating working directory
+updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pushing to git://localhost/gitrepo
 importing Hg objects into Git
@@ -43,7 +43,7 @@
 Total 6 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 at: 0/3
-updating working directory
+updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 o  changeset:   2:698615204564
 |  branch:      gamma
--- a/tests/test-hg-tags.out
+++ b/tests/test-hg-tags.out
@@ -5,7 +5,7 @@
 Total 3 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 at: 0/1
-updating working directory
+updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pushing to git://localhost/gitrepo
 importing Hg objects into Git
@@ -35,7 +35,7 @@
 Total 6 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 at: 0/2
-updating working directory
+updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:d529e9229f6d
 |  tag:         default/master
--- a/tests/test-merge.out
+++ b/tests/test-merge.out
@@ -14,7 +14,7 @@
 Total 11 (delta 3), reused 0 (delta 0)
 importing Git objects into Hg
 at: 0/4
-updating working directory
+updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % clear the cache to be sure it is regenerated correctly
 clearing out the git cache data
--- a/tests/test-octopus.out
+++ b/tests/test-octopus.out
@@ -19,7 +19,7 @@
 Total 14 (delta 3), reused 0 (delta 0)
 importing Git objects into Hg
 at: 0/5
-updating working directory
+updating to branch default
 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @    changeset:   5:7acfed59bdde
 |\   tag:         master
--- a/tests/test-outgoing.out
+++ b/tests/test-outgoing.out
@@ -5,7 +5,7 @@
 Total 3 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 at: 0/1
-updating working directory
+updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 comparing with git://localhost/gitrepo
 importing Hg objects into Git
--- a/tests/test-pull.out
+++ b/tests/test-pull.out
@@ -7,7 +7,7 @@
 Total 3 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 at: 0/1
-updating working directory
+updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   0:3442585be8a6
    tag:         alpha
@@ -25,7 +25,7 @@
 Total 6 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 at: 0/2
-updating working directory
+updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:7bcd915dc873
 |  tag:         default/beta
--- a/tests/test-push.out
+++ b/tests/test-push.out
@@ -5,7 +5,7 @@
 Total 3 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 at: 0/1
-updating working directory
+updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pushing to git://localhost/gitrepo
 importing Hg objects into Git
--- a/tests/test-sane-without-bookmarks.out
+++ b/tests/test-sane-without-bookmarks.out
@@ -7,7 +7,7 @@
 importing Git objects into Hg
 at: 0/2
 creating bookmarks failed, do you have bookmarks enabled?
-updating working directory
+updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:7bcd915dc873
 |  tag:         default/master
--- a/tests/test-tree-decomposition.out
+++ b/tests/test-tree-decomposition.out
@@ -15,7 +15,7 @@
 Total 8 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 at: 0/2
-updating working directory
+updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adds: d2/f2
 dels: d1/f2