Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hg-git
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
heptapod
hg-git
Commits
ac36f1a0
Commit
ac36f1a0
authored
13 years ago
by
Augie Fackler
Browse files
Options
Downloads
Patches
Plain Diff
test-incoming: fixes for hg 1.7
parent
d89d4e93
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tests/test-incoming
+7
-7
7 additions, 7 deletions
tests/test-incoming
tests/test-incoming.out
+0
-7
0 additions, 7 deletions
tests/test-incoming.out
with
7 additions
and
14 deletions
tests/test-incoming
+
7
−
7
View file @
ac36f1a0
...
...
@@ -59,7 +59,7 @@
hg clone git://localhost/gitrepo hgrepo |
grep
-v
'^updating'
cd
hgrepo
hg incoming
hg incoming
|
grep
-v
'no changes found'
|
grep
-v
'bookmark:'
cd
../gitrepo
echo
beta
>
beta
...
...
@@ -67,7 +67,7 @@
commit
-m
'add beta'
cd
../hgrepo
hg incoming
hg incoming
|
grep
-v
'no changes found'
|
grep
-v
'bookmark:'
cd
../gitrepo
git checkout
-b
b1 HEAD^
...
...
@@ -82,6 +82,6 @@
commit
-m
'add d/gamma line 2'
cd
../hgrepo
hg incoming
-p
hg incoming
-p
|
grep
-v
'no changes found'
|
grep
-v
'bookmark:'
echo
% incoming
-r
...
...
@@ -86,8 +86,8 @@
echo
% incoming
-r
hg incoming
-r
master
hg incoming
-r
b1
hg incoming
-r
t1
hg incoming
-r
master
|
grep
-v
'no changes found'
|
grep
-v
'bookmark:'
hg incoming
-r
b1
|
grep
-v
'no changes found'
|
grep
-v
'bookmark:'
hg incoming
-r
t1
|
grep
-v
'no changes found'
|
grep
-v
'bookmark:'
echo
% nothing incoming after pull
hg pull
...
...
@@ -91,6 +91,6 @@
echo
% nothing incoming after pull
hg pull
hg incoming
hg incoming
|
grep
-v
'no changes found'
|
grep
-v
'bookmark:'
echo
'done'
This diff is collapsed.
Click to expand it.
tests/test-incoming.out
+
0
−
7
View file @
ac36f1a0
...
...
@@ -5,9 +5,8 @@
importing git objects into hg
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
comparing with git://localhost/gitrepo
no changes found
comparing with git://localhost/gitrepo
Counting objects: 3, done.
Compressing objects: 50% (1/2) Compressing objects: 100% (2/2) Compressing objects: 100% (2/2), done.
Total 3 (delta 0), reused 0 (delta 0)
changeset: 1:9497a4ee62e1
...
...
@@ -9,9 +8,8 @@
comparing with git://localhost/gitrepo
Counting objects: 3, done.
Compressing objects: 50% (1/2) Compressing objects: 100% (2/2) Compressing objects: 100% (2/2), done.
Total 3 (delta 0), reused 0 (delta 0)
changeset: 1:9497a4ee62e1
bookmark: master
user: test <test@example.org>
date: Mon Jan 01 00:00:11 2007 +0000
summary: add beta
...
...
@@ -22,7 +20,6 @@
Compressing objects: 25% (1/4) Compressing objects: 50% (2/4) Compressing objects: 75% (3/4) Compressing objects: 100% (4/4) Compressing objects: 100% (4/4), done.
Total 8 (delta 0), reused 0 (delta 0)
changeset: 1:9497a4ee62e1
bookmark: master
user: test <test@example.org>
date: Mon Jan 01 00:00:11 2007 +0000
summary: add beta
...
...
@@ -47,7 +44,6 @@
+gamma
changeset: 3:5202f48c20c9
bookmark: b1
user: test <test@example.org>
date: Mon Jan 01 00:00:13 2007 +0000
summary: add d/gamma line 2
...
...
@@ -62,7 +58,6 @@
% incoming -r
comparing with git://localhost/gitrepo
changeset: 1:9497a4ee62e1
bookmark: master
user: test <test@example.org>
date: Mon Jan 01 00:00:11 2007 +0000
summary: add beta
...
...
@@ -75,7 +70,6 @@
summary: add d/gamma
changeset: 2:5202f48c20c9
bookmark: b1
user: test <test@example.org>
date: Mon Jan 01 00:00:13 2007 +0000
summary: add d/gamma line 2
...
...
@@ -92,5 +86,4 @@
importing git objects into hg
(run 'hg heads' to see heads, 'hg merge' to merge)
comparing with git://localhost/gitrepo
no changes found
done
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment