equal
deleted
inserted
replaced
320 $ cd .. |
320 $ cd .. |
321 $ hg update tip |
321 $ hg update tip |
322 subrepository s diverged (local revision: 2, remote revision: 3) |
322 subrepository s diverged (local revision: 2, remote revision: 3) |
323 (M)erge, keep (l)ocal or keep (r)emote? m |
323 (M)erge, keep (l)ocal or keep (r)emote? m |
324 subrepository sources for s differ |
324 subrepository sources for s differ |
325 use (l)ocal source (2) or (r)emote source (3)? |
325 use (l)ocal source (2) or (r)emote source (3)? l |
326 l |
|
327 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
326 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
328 $ hg id -n |
327 $ hg id -n |
329 2+ |
328 2+ |
330 $ cd s |
329 $ cd s |
331 $ svnversion |
330 $ svnversion |
352 $ cd .. |
351 $ cd .. |
353 $ hg update 1 |
352 $ hg update 1 |
354 subrepository s diverged (local revision: 3, remote revision: 2) |
353 subrepository s diverged (local revision: 3, remote revision: 2) |
355 (M)erge, keep (l)ocal or keep (r)emote? m |
354 (M)erge, keep (l)ocal or keep (r)emote? m |
356 subrepository sources for s differ (in checked out version) |
355 subrepository sources for s differ (in checked out version) |
357 use (l)ocal source (1) or (r)emote source (2)? |
356 use (l)ocal source (1) or (r)emote source (2)? l |
358 l |
|
359 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
357 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
360 $ hg id -n |
358 $ hg id -n |
361 1+ |
359 1+ |
362 $ cd s |
360 $ cd s |
363 $ svnversion |
361 $ svnversion |
376 1+ |
374 1+ |
377 $ hg update tip |
375 $ hg update tip |
378 subrepository s diverged (local revision: 3, remote revision: 3) |
376 subrepository s diverged (local revision: 3, remote revision: 3) |
379 (M)erge, keep (l)ocal or keep (r)emote? m |
377 (M)erge, keep (l)ocal or keep (r)emote? m |
380 subrepository sources for s differ |
378 subrepository sources for s differ |
381 use (l)ocal source (1) or (r)emote source (3)? |
379 use (l)ocal source (1) or (r)emote source (3)? l |
382 l |
|
383 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
380 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
384 $ hg id -n |
381 $ hg id -n |
385 2+ |
382 2+ |
386 $ cd s |
383 $ cd s |
387 $ svnversion |
384 $ svnversion |