equal
deleted
inserted
replaced
3 adding d1/d2/b |
3 adding d1/d2/b |
4 % modify |
4 % modify |
5 1:e0e2b8a9156b |
5 1:e0e2b8a9156b |
6 assuming destination a-hg |
6 assuming destination a-hg |
7 initializing svn repository 'a-hg' |
7 initializing svn repository 'a-hg' |
8 initializing svn wc 'a-hg-wc' |
8 initializing svn working copy 'a-hg-wc' |
9 scanning source... |
9 scanning source... |
10 sorting... |
10 sorting... |
11 converting... |
11 converting... |
12 1 add a file |
12 1 add a file |
13 0 modify a file |
13 0 modify a file |
55 d1 |
55 d1 |
56 same |
56 same |
57 % rename |
57 % rename |
58 2:eb5169441d43 |
58 2:eb5169441d43 |
59 assuming destination a-hg |
59 assuming destination a-hg |
60 initializing svn wc 'a-hg-wc' |
60 initializing svn working copy 'a-hg-wc' |
61 scanning source... |
61 scanning source... |
62 sorting... |
62 sorting... |
63 converting... |
63 converting... |
64 0 rename a file |
64 0 rename a file |
65 At revision 3. |
65 At revision 3. |
93 b |
93 b |
94 d1 |
94 d1 |
95 % copy |
95 % copy |
96 3:60effef6ab48 |
96 3:60effef6ab48 |
97 assuming destination a-hg |
97 assuming destination a-hg |
98 initializing svn wc 'a-hg-wc' |
98 initializing svn working copy 'a-hg-wc' |
99 scanning source... |
99 scanning source... |
100 sorting... |
100 sorting... |
101 converting... |
101 converting... |
102 0 copy a file |
102 0 copy a file |
103 At revision 4. |
103 At revision 4. |
132 c |
132 c |
133 d1 |
133 d1 |
134 % remove |
134 % remove |
135 4:87bbe3013fb6 |
135 4:87bbe3013fb6 |
136 assuming destination a-hg |
136 assuming destination a-hg |
137 initializing svn wc 'a-hg-wc' |
137 initializing svn working copy 'a-hg-wc' |
138 scanning source... |
138 scanning source... |
139 sorting... |
139 sorting... |
140 converting... |
140 converting... |
141 0 remove a file |
141 0 remove a file |
142 At revision 5. |
142 At revision 5. |
166 c |
166 c |
167 d1 |
167 d1 |
168 % executable |
168 % executable |
169 5:ff42e473c340 |
169 5:ff42e473c340 |
170 assuming destination a-hg |
170 assuming destination a-hg |
171 initializing svn wc 'a-hg-wc' |
171 initializing svn working copy 'a-hg-wc' |
172 scanning source... |
172 scanning source... |
173 sorting... |
173 sorting... |
174 converting... |
174 converting... |
175 0 make a file executable |
175 0 make a file executable |
176 At revision 6. |
176 At revision 6. |
195 executable |
195 executable |
196 % executable in new directory |
196 % executable in new directory |
197 adding d1/a |
197 adding d1/a |
198 assuming destination a-hg |
198 assuming destination a-hg |
199 initializing svn repository 'a-hg' |
199 initializing svn repository 'a-hg' |
200 initializing svn wc 'a-hg-wc' |
200 initializing svn working copy 'a-hg-wc' |
201 scanning source... |
201 scanning source... |
202 sorting... |
202 sorting... |
203 converting... |
203 converting... |
204 0 add executable file in new directory |
204 0 add executable file in new directory |
205 At revision 1. |
205 At revision 1. |
222 </logentry> |
222 </logentry> |
223 </log> |
223 </log> |
224 executable |
224 executable |
225 % copy to new directory |
225 % copy to new directory |
226 assuming destination a-hg |
226 assuming destination a-hg |
227 initializing svn wc 'a-hg-wc' |
227 initializing svn working copy 'a-hg-wc' |
228 scanning source... |
228 scanning source... |
229 sorting... |
229 sorting... |
230 converting... |
230 converting... |
231 0 copy file to new directory |
231 0 copy file to new directory |
232 At revision 2. |
232 At revision 2. |
266 merging b failed! |
266 merging b failed! |
267 2 files updated, 0 files merged, 0 files removed, 1 files unresolved |
267 2 files updated, 0 files merged, 0 files removed, 1 files unresolved |
268 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
268 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
269 assuming destination b-hg |
269 assuming destination b-hg |
270 initializing svn repository 'b-hg' |
270 initializing svn repository 'b-hg' |
271 initializing svn wc 'b-hg-wc' |
271 initializing svn working copy 'b-hg-wc' |
272 scanning source... |
272 scanning source... |
273 sorting... |
273 sorting... |
274 converting... |
274 converting... |
275 5 base |
275 5 base |
276 4 left-1 |
276 4 left-1 |