equal
deleted
inserted
replaced
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 |
|
322 subrepository s diverged (local revision: 2, remote revision: 3) |
|
323 (M)erge, keep (l)ocal or keep (r)emote? m |
322 subrepository sources for s differ |
324 subrepository sources for s differ |
323 use (l)ocal source (2) or (r)emote source (3)? |
325 use (l)ocal source (2) or (r)emote source (3)? |
324 l |
326 l |
325 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
327 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
326 $ hg id -n |
328 $ hg id -n |
347 $ cd .. |
349 $ cd .. |
348 $ cd s |
350 $ cd s |
349 $ svn update -qr 1 |
351 $ svn update -qr 1 |
350 $ cd .. |
352 $ cd .. |
351 $ hg update 1 |
353 $ hg update 1 |
|
354 subrepository s diverged (local revision: 3, remote revision: 2) |
|
355 (M)erge, keep (l)ocal or keep (r)emote? m |
352 subrepository sources for s differ (in checked out version) |
356 subrepository sources for s differ (in checked out version) |
353 use (l)ocal source (1) or (r)emote source (2)? |
357 use (l)ocal source (1) or (r)emote source (2)? |
354 l |
358 l |
355 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
359 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
356 $ hg id -n |
360 $ hg id -n |
369 1M |
373 1M |
370 $ cd .. |
374 $ cd .. |
371 $ hg id -n |
375 $ hg id -n |
372 1+ |
376 1+ |
373 $ hg update tip |
377 $ hg update tip |
|
378 subrepository s diverged (local revision: 3, remote revision: 3) |
|
379 (M)erge, keep (l)ocal or keep (r)emote? m |
374 subrepository sources for s differ |
380 subrepository sources for s differ |
375 use (l)ocal source (1) or (r)emote source (3)? |
381 use (l)ocal source (1) or (r)emote source (3)? |
376 l |
382 l |
377 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
383 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
378 $ hg id -n |
384 $ hg id -n |
402 Test subrepo already at intended revision: |
408 Test subrepo already at intended revision: |
403 $ cd s |
409 $ cd s |
404 $ svn update -qr 2 |
410 $ svn update -qr 2 |
405 $ cd .. |
411 $ cd .. |
406 $ hg update 1 |
412 $ hg update 1 |
|
413 subrepository s diverged (local revision: 3, remote revision: 2) |
|
414 (M)erge, keep (l)ocal or keep (r)emote? m |
407 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
415 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
408 $ hg id -n |
416 $ hg id -n |
409 1+ |
417 1+ |
410 $ cd s |
418 $ cd s |
411 $ svnversion |
419 $ svnversion |