Mercurial > hg

comparison tests/test-subrepo-svn.t @ 42588:f6540aba8e3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepos: make last line of prompts <40 english chars (issue6158) Differential Revision: https://phab.mercurial-scm.org/D6572
author Kyle Lippincott <spectral@google.com>
date Mon, 24 Jun 2019 16:01:01 -0700
parents e095a9688a31
children e598c874b4af
comparison
equal deleted inserted replaced
42587:421fdf30c37c 42588:f6540aba8e3e
319 $ svnversion 319 $ svnversion
320 2M 320 2M
321 $ cd .. 321 $ cd ..
322 $ hg update tip 322 $ hg update tip
323 subrepository s diverged (local revision: 2, remote revision: 3) 323 subrepository s diverged (local revision: 2, remote revision: 3)
324 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m 324 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination].
325 what do you want to do? m
325 subrepository sources for s differ 326 subrepository sources for s differ
326 use (l)ocal source (2) or (r)emote source (3)? l 327 you can use (l)ocal source (2) or (r)emote source (3).
328 what do you want to do? l
327 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 329 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
328 $ hg id -n 330 $ hg id -n
329 2+ 331 2+
330 $ cd s 332 $ cd s
331 $ svnversion 333 $ svnversion
350 $ cd s 352 $ cd s
351 $ svn update -qr 1 353 $ svn update -qr 1
352 $ cd .. 354 $ cd ..
353 $ hg update 1 355 $ hg update 1
354 subrepository s diverged (local revision: 3, remote revision: 2) 356 subrepository s diverged (local revision: 3, remote revision: 2)
355 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m 357 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination].
358 what do you want to do? m
356 subrepository sources for s differ (in checked out version) 359 subrepository sources for s differ (in checked out version)
357 use (l)ocal source (1) or (r)emote source (2)? l 360 you can use (l)ocal source (1) or (r)emote source (2).
361 what do you want to do? l
358 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 362 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
359 $ hg id -n 363 $ hg id -n
360 1+ 364 1+
361 $ cd s 365 $ cd s
362 $ svnversion 366 $ svnversion
373 $ cd .. 377 $ cd ..
374 $ hg id -n 378 $ hg id -n
375 1+ 379 1+
376 $ hg update tip 380 $ hg update tip
377 subrepository s diverged (local revision: 3, remote revision: 3) 381 subrepository s diverged (local revision: 3, remote revision: 3)
378 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m 382 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination].
383 what do you want to do? m
379 subrepository sources for s differ 384 subrepository sources for s differ
380 use (l)ocal source (1) or (r)emote source (3)? l 385 you can use (l)ocal source (1) or (r)emote source (3).
386 what do you want to do? l
381 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 387 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
382 $ hg id -n 388 $ hg id -n
383 2+ 389 2+
384 $ cd s 390 $ cd s
385 $ svnversion 391 $ svnversion
407 $ cd s 413 $ cd s
408 $ svn update -qr 2 414 $ svn update -qr 2
409 $ cd .. 415 $ cd ..
410 $ hg update 1 416 $ hg update 1
411 subrepository s diverged (local revision: 3, remote revision: 2) 417 subrepository s diverged (local revision: 3, remote revision: 2)
412 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m 418 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination].
419 what do you want to do? m
413 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 420 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
414 $ hg id -n 421 $ hg id -n
415 1+ 422 1+
416 $ cd s 423 $ cd s
417 $ svnversion 424 $ svnversion