@@ -8,7 +8,7 @@ Counting objects: 2, done. 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 tests/test-empty-working-tree.out @@ -14,7 +14,7 @@ Compressing objects: 14% (1/7) Compressing objects: 28% (2/7) Compressin 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 tests/test-encoding.out @@ -12,7 +12,7 @@ Compressing objects: 12% (1/8) Compressing objects: 25% (2/8) Compressin 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 tests/test-file-removal.out @@ -6,7 +6,7 @@ Compressing objects: 33% (1/3) Compressing objects: 66% (2/3) Compressin 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 tests/test-git-clone.out @@ -6,7 +6,7 @@ Compressing objects: 25% (1/4) Compressing objects: 50% (2/4) Compressin 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 tests/test-git-tags.out @@ -5,7 +5,7 @@ Counting objects: 3, done. 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 @@ Compressing objects: 20% (1/5) Compressing objects: 40% (2/5) Compressin 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 tests/test-hg-author.out @@ -5,7 +5,7 @@ Counting objects: 3, done. 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 @@ Compressing objects: 33% (1/3) Compressing objects: 66% (2/3) Compressin 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 tests/test-hg-branch.out @@ -5,7 +5,7 @@ Counting objects: 3, done. 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 @@ Compressing objects: 33% (1/3) Compressing objects: 66% (2/3) Compressin 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 tests/test-hg-tags.out @@ -14,7 +14,7 @@ Compressing objects: 14% (1/7) Compressing objects: 28% (2/7) Compressin 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 tests/test-merge.out @@ -19,7 +19,7 @@ Compressing objects: 11% (1/9) Compressing objects: 22% (2/9) Compressin 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 tests/test-octopus.out @@ -5,7 +5,7 @@ Counting objects: 3, done. 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 tests/test-outgoing.out @@ -7,7 +7,7 @@ Counting objects: 3, done. 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 @@ Compressing objects: 33% (1/3) Compressing objects: 66% (2/3) Compressin 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 tests/test-pull.out @@ -5,7 +5,7 @@ Counting objects: 3, done. 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 tests/test-push.out @@ -7,7 +7,7 @@ Total 6 (delta 0), reused 0 (delta 0) 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 tests/test-sane-without-bookmarks.out @@ -15,7 +15,7 @@ Compressing objects: 25% (1/4) Compressing objects: 50% (2/4) Compressin 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 tests/test-tree-decomposition.out 2d1a527b2489c9d10e98bcfa14ee52ca4f731db4 Augie Fackler durin42@gmail.com http://github.com/schacon/hg-git/commit/ad985053066e9d3dd7dc9f4774d35c87d376e85a ad985053066e9d3dd7dc9f4774d35c87d376e85a 2009-10-27T19:40:11-07:00 2009-10-27T19:40:11-07:00 tests: update test expectations for hg change a3d73b3e1f8a de155f4c59fdd6a8ffb6a52378864edb56fd53f9 Augie Fackler durin42@gmail.com