Mercurial > hg

comparison tests/test-subrepo-svn.t @ 19937:1596f2d8f242 stable 2.8-rc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default into stable for 2.8 freeze
author Matt Mackall <mpm@selenic.com>
date Sun, 20 Oct 2013 16:43:11 -0700
parents 5e10d41e7b9c
children 7731a2281cf0
comparison
equal deleted inserted replaced
19914:f91e932b2cfe 19937:1596f2d8f242
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
475 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 483 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
476 484
477 This is surprising, but is also correct based on the current code: 485 This is surprising, but is also correct based on the current code:
478 $ echo "updating should (maybe) fail" > obstruct/other 486 $ echo "updating should (maybe) fail" > obstruct/other
479 $ hg co tip 487 $ hg co tip
480 abort: crosses branches (merge branches or use --clean to discard changes) 488 abort: uncommitted changes
489 (commit or update --clean to discard changes)
481 [255] 490 [255]
482 491
483 Point to a Subversion branch which has since been deleted and recreated 492 Point to a Subversion branch which has since been deleted and recreated
484 First, create that condition in the repository. 493 First, create that condition in the repository.
485 494