equal
deleted
inserted
replaced
8 4 t2 |
8 4 t2 |
9 3 t3 |
9 3 t3 |
10 2 t4.1 |
10 2 t4.1 |
11 1 t4.2 |
11 1 t4.2 |
12 0 Merge branch other |
12 0 Merge branch other |
13 changeset: 5:4ab1af49a271 |
13 changeset: 5:c78094926be2 |
14 tag: tip |
14 tag: tip |
15 parent: 3:0222ab0998d7 |
15 parent: 3:f5f5cb45432b |
16 parent: 4:5333c870e3c2 |
16 parent: 4:4e174f80c67c |
17 user: test <test@example.org> |
17 user: test <test@example.org> |
18 date: Mon Jan 01 00:00:15 2007 +0000 |
18 date: Mon Jan 01 00:00:15 2007 +0000 |
19 files: a |
19 files: a |
20 description: |
20 description: |
21 Merge branch other |
21 Merge branch other |
22 |
|
23 committer: test <test@example.org> |
|
24 |
22 |
25 |
23 |
26 % full conversion |
24 % full conversion |
27 @ 9 "Discard change to foo" files: foo |
25 @ 9 "Discard change to foo" files: foo |
28 |\ |
26 |\ |
96 sorting... |
94 sorting... |
97 converting... |
95 converting... |
98 0 addbinary |
96 0 addbinary |
99 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
97 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
100 4096 |
98 4096 |
|
99 |
|
100 % test author vs committer |
|
101 % convert author committer |
|
102 initializing destination git-repo4-hg repository |
|
103 scanning source... |
|
104 sorting... |
|
105 converting... |
|
106 1 addfoo |
|
107 0 addfoo2 |
|
108 changeset: 1:d63e967f93da |
|
109 tag: tip |
|
110 user: nottest <test@example.org> |
|
111 date: Mon Jan 01 00:00:21 2007 +0000 |
|
112 files: foo |
|
113 description: |
|
114 addfoo2 |
|
115 |
|
116 committer: test <test@example.org> |
|
117 |
|
118 |
|
119 changeset: 0:0735477b0224 |
|
120 user: test <test@example.org> |
|
121 date: Mon Jan 01 00:00:20 2007 +0000 |
|
122 files: foo |
|
123 description: |
|
124 addfoo |
|
125 |
|
126 |