Skip to content
Snippets Groups Projects
Commit 5790ef25 authored by Augie Fackler's avatar Augie Fackler
Browse files

tests: update test expectations for hg change a3d73b3e1f8a

parent 3caa2ce5
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment