equal
deleted
inserted
replaced
311 $ cd s |
311 $ cd s |
312 $ svn add f1 |
312 $ svn add f1 |
313 A f1 |
313 A f1 |
314 $ cd .. |
314 $ cd .. |
315 $ hg id -n |
315 $ hg id -n |
316 1 |
316 1+ |
317 $ cd s |
317 $ cd s |
318 $ svnversion |
318 $ svnversion |
319 2M |
319 2M |
320 $ cd .. |
320 $ cd .. |
321 $ hg update tip |
321 $ hg update tip |
374 subrepository sources for s differ |
374 subrepository sources for s differ |
375 use (l)ocal source (1) or (r)emote source (3)? |
375 use (l)ocal source (1) or (r)emote source (3)? |
376 l |
376 l |
377 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
377 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
378 $ hg id -n |
378 $ hg id -n |
379 2 |
379 2+ |
380 $ cd s |
380 $ cd s |
381 $ svnversion |
381 $ svnversion |
382 1M |
382 1M |
383 $ cd .. |
383 $ cd .. |
384 |
384 |