equal
deleted
inserted
replaced
308 $ svnversion |
308 $ svnversion |
309 2M |
309 2M |
310 $ cd .. |
310 $ cd .. |
311 $ hg update tip |
311 $ hg update tip |
312 subrepository s diverged (local revision: 2, remote revision: 3) |
312 subrepository s diverged (local revision: 2, remote revision: 3) |
313 (M)erge, keep (l)ocal or keep (r)emote? m |
313 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
314 subrepository sources for s differ |
314 subrepository sources for s differ |
315 use (l)ocal source (2) or (r)emote source (3)? l |
315 use (l)ocal source (2) or (r)emote source (3)? l |
316 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
316 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
317 $ hg id -n |
317 $ hg id -n |
318 2+ |
318 2+ |
339 $ cd s |
339 $ cd s |
340 $ svn update -qr 1 |
340 $ svn update -qr 1 |
341 $ cd .. |
341 $ cd .. |
342 $ hg update 1 |
342 $ hg update 1 |
343 subrepository s diverged (local revision: 3, remote revision: 2) |
343 subrepository s diverged (local revision: 3, remote revision: 2) |
344 (M)erge, keep (l)ocal or keep (r)emote? m |
344 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
345 subrepository sources for s differ (in checked out version) |
345 subrepository sources for s differ (in checked out version) |
346 use (l)ocal source (1) or (r)emote source (2)? l |
346 use (l)ocal source (1) or (r)emote source (2)? l |
347 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
347 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
348 $ hg id -n |
348 $ hg id -n |
349 1+ |
349 1+ |
362 $ cd .. |
362 $ cd .. |
363 $ hg id -n |
363 $ hg id -n |
364 1+ |
364 1+ |
365 $ hg update tip |
365 $ hg update tip |
366 subrepository s diverged (local revision: 3, remote revision: 3) |
366 subrepository s diverged (local revision: 3, remote revision: 3) |
367 (M)erge, keep (l)ocal or keep (r)emote? m |
367 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
368 subrepository sources for s differ |
368 subrepository sources for s differ |
369 use (l)ocal source (1) or (r)emote source (3)? l |
369 use (l)ocal source (1) or (r)emote source (3)? l |
370 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
370 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
371 $ hg id -n |
371 $ hg id -n |
372 2+ |
372 2+ |
396 $ cd s |
396 $ cd s |
397 $ svn update -qr 2 |
397 $ svn update -qr 2 |
398 $ cd .. |
398 $ cd .. |
399 $ hg update 1 |
399 $ hg update 1 |
400 subrepository s diverged (local revision: 3, remote revision: 2) |
400 subrepository s diverged (local revision: 3, remote revision: 2) |
401 (M)erge, keep (l)ocal or keep (r)emote? m |
401 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
402 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
402 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
403 $ hg id -n |
403 $ hg id -n |
404 1+ |
404 1+ |
405 $ cd s |
405 $ cd s |
406 $ svnversion |
406 $ svnversion |