Mercurial > hg

comparison tests/test-subrepo.t @ 16107:a3dcc59054ca stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: backout change to return code This bit a number of people.
author Matt Mackall <mpm@selenic.com>
date Fri, 10 Feb 2012 16:09:30 -0600
parents 093b75c7b44b
children cb756482c1aa
comparison
equal deleted inserted replaced
16106:d75aa756149b 16107:a3dcc59054ca
578 $ hg clone repo repo2 578 $ hg clone repo repo2
579 updating to branch default 579 updating to branch default
580 cloning subrepo s from $TESTTMP/sub/repo/s (glob) 580 cloning subrepo s from $TESTTMP/sub/repo/s (glob)
581 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 581 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
582 $ hg -q -R repo2 pull -u 582 $ hg -q -R repo2 pull -u
583 [1]
584 $ echo 1 > repo2/s/a 583 $ echo 1 > repo2/s/a
585 $ hg -R repo2/s ci -m2 584 $ hg -R repo2/s ci -m2
586 $ hg -q -R repo2/s push 585 $ hg -q -R repo2/s push
587 $ hg -R repo2/s up -C 0 586 $ hg -R repo2/s up -C 0
588 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 587 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
637 636
638 $ hg -R issue1852b pull -u issue1852a 637 $ hg -R issue1852b pull -u issue1852a
639 pulling from issue1852a 638 pulling from issue1852a
640 searching for changes 639 searching for changes
641 no changes found 640 no changes found
642 [1]
643 641
644 Try the same, but with pull -u 642 Try the same, but with pull -u
645 643
646 $ hg init issue1852c 644 $ hg init issue1852c
647 $ hg -R issue1852c pull -r0 -u issue1852a 645 $ hg -R issue1852c pull -r0 -u issue1852a