equal
deleted
inserted
replaced
2 adding a |
2 adding a |
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 repo 'a-hg' |
7 initializing svn repository 'a-hg' |
8 initializing svn wc 'a-hg-wc' |
8 initializing svn wc '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 |
194 </log> |
194 </log> |
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 repo 'a-hg' |
199 initializing svn repository 'a-hg' |
200 initializing svn wc 'a-hg-wc' |
200 initializing svn wc '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 |
265 warning: conflicts during merge. |
265 warning: conflicts during merge. |
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 repo 'b-hg' |
270 initializing svn repository 'b-hg' |
271 initializing svn wc 'b-hg-wc' |
271 initializing svn wc 'b-hg-wc' |
272 scanning source... |
272 scanning source... |
273 sorting... |
273 sorting... |
274 converting... |
274 converting... |
275 5 base |
275 5 base |