equal
deleted
inserted
replaced
55 4 t2 |
55 4 t2 |
56 3 t3 |
56 3 t3 |
57 2 t4.1 |
57 2 t4.1 |
58 1 t4.2 |
58 1 t4.2 |
59 0 Merge branch other |
59 0 Merge branch other |
|
60 updating bookmarks |
60 $ hg up -q -R git-repo-hg |
61 $ hg up -q -R git-repo-hg |
61 $ hg -R git-repo-hg tip -v |
62 $ hg -R git-repo-hg tip -v |
62 changeset: 5:c78094926be2 |
63 changeset: 5:c78094926be2 |
|
64 bookmark: master |
63 tag: tip |
65 tag: tip |
64 parent: 3:f5f5cb45432b |
66 parent: 3:f5f5cb45432b |
65 parent: 4:4e174f80c67c |
67 parent: 4:4e174f80c67c |
66 user: test <test@example.org> |
68 user: test <test@example.org> |
67 date: Mon Jan 01 00:00:15 2007 +0000 |
69 date: Mon Jan 01 00:00:15 2007 +0000 |
215 initializing destination git-repo3-hg repository |
217 initializing destination git-repo3-hg repository |
216 scanning source... |
218 scanning source... |
217 sorting... |
219 sorting... |
218 converting... |
220 converting... |
219 0 addbinary |
221 0 addbinary |
|
222 updating bookmarks |
220 $ cd git-repo3-hg |
223 $ cd git-repo3-hg |
221 $ hg up -C |
224 $ hg up -C |
222 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
225 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
223 $ python -c 'print len(file("b", "rb").read())' |
226 $ python -c 'print len(file("b", "rb").read())' |
224 4096 |
227 4096 |
246 scanning source... |
249 scanning source... |
247 sorting... |
250 sorting... |
248 converting... |
251 converting... |
249 1 addfoo |
252 1 addfoo |
250 0 addfoo2 |
253 0 addfoo2 |
|
254 updating bookmarks |
251 $ hg -R git-repo4-hg log -v |
255 $ hg -R git-repo4-hg log -v |
252 changeset: 1:d63e967f93da |
256 changeset: 1:d63e967f93da |
|
257 bookmark: master |
253 tag: tip |
258 tag: tip |
254 user: nottest <test@example.org> |
259 user: nottest <test@example.org> |
255 date: Mon Jan 01 00:00:21 2007 +0000 |
260 date: Mon Jan 01 00:00:21 2007 +0000 |
256 files: foo |
261 files: foo |
257 description: |
262 description: |