1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
|
Load commonly used test logic
$ . "$TESTDIR/testutil"
$ git init gitrepo
Initialized empty Git repository in $TESTTMP/gitrepo/.git/
$ cd gitrepo
$ echo alpha > alpha
$ git add alpha
$ fn_git_commit -m "add alpha"
$ git branch alpha
$ git show-ref
7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/alpha
7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/master
$ cd ..
$ hg clone gitrepo hgrepo
importing 1 git commits
new changesets ff7a2f2d8d70 (1 drafts)
updating to bookmark master
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd hgrepo
$ hg book
alpha 0:ff7a2f2d8d70
* master 0:ff7a2f2d8d70
$ hg update -q master
$ echo beta > beta
$ hg add beta
$ fn_hg_commit -m 'add beta'
$ echo gamma > gamma
$ hg add gamma
$ fn_hg_commit -m 'add gamma'
$ hg book -r 1 beta
$ hg outgoing | grep -v 'searching for changes'
comparing with $TESTTMP/gitrepo
changeset: 1:47580592d3d6
bookmark: beta
user: test
date: Mon Jan 01 00:00:11 2007 +0000
summary: add beta
changeset: 2:953796e1cfd8
bookmark: master
tag: tip
user: test
date: Mon Jan 01 00:00:12 2007 +0000
summary: add gamma
$ hg outgoing -r beta
comparing with $TESTTMP/gitrepo
searching for changes
changeset: 1:47580592d3d6
bookmark: beta
user: test
date: Mon Jan 01 00:00:11 2007 +0000
summary: add beta
$ hg outgoing -r master
comparing with $TESTTMP/gitrepo
searching for changes
changeset: 1:47580592d3d6
bookmark: beta
user: test
date: Mon Jan 01 00:00:11 2007 +0000
summary: add beta
changeset: 2:953796e1cfd8
bookmark: master
tag: tip
user: test
date: Mon Jan 01 00:00:12 2007 +0000
summary: add gamma
$ cd ..
some more work on master from git
$ cd gitrepo
Check state of refs after outgoing
$ git show-ref
7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/alpha
7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03 refs/heads/master
$ git checkout master 2>&1 | sed s/\'/\"/g
Already on "master"
$ echo delta > delta
$ git add delta
$ fn_git_commit -m "add delta"
$ cd ..
$ cd hgrepo
this will fail # maybe we should try to make it work
$ hg outgoing
comparing with $TESTTMP/gitrepo
abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing
[255]
let's pull and try again
$ hg pull
pulling from */gitrepo (glob)
importing 1 git commits
not updating diverged bookmark master
new changesets 25eed24f5e8f (1 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg log --graph
o changeset: 3:25eed24f5e8f
| tag: default/master
| tag: tip
| parent: 0:ff7a2f2d8d70
| user: test <test@example.org>
| date: Mon Jan 01 00:00:13 2007 +0000
| summary: add delta
|
| @ changeset: 2:953796e1cfd8
| | bookmark: master
| | user: test
| | date: Mon Jan 01 00:00:12 2007 +0000
| | summary: add gamma
| |
| o changeset: 1:47580592d3d6
|/ bookmark: beta
| user: test
| date: Mon Jan 01 00:00:11 2007 +0000
| summary: add beta
|
o changeset: 0:ff7a2f2d8d70
bookmark: alpha
tag: default/alpha
user: test <test@example.org>
date: Mon Jan 01 00:00:10 2007 +0000
summary: add alpha
$ hg outgoing
comparing with $TESTTMP/gitrepo
searching for changes
changeset: 1:47580592d3d6
bookmark: beta
user: test
date: Mon Jan 01 00:00:11 2007 +0000
summary: add beta
changeset: 2:953796e1cfd8
bookmark: master
user: test
date: Mon Jan 01 00:00:12 2007 +0000
summary: add gamma
$ hg outgoing -r beta
comparing with $TESTTMP/gitrepo
searching for changes
changeset: 1:47580592d3d6
bookmark: beta
user: test
date: Mon Jan 01 00:00:11 2007 +0000
summary: add beta
$ hg outgoing -r master
comparing with $TESTTMP/gitrepo
searching for changes
changeset: 1:47580592d3d6
bookmark: beta
user: test
date: Mon Jan 01 00:00:11 2007 +0000
summary: add beta
changeset: 2:953796e1cfd8
bookmark: master
user: test
date: Mon Jan 01 00:00:12 2007 +0000
summary: add gamma
$ cd ..
|
