equal
deleted
inserted
replaced
318 pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) |
318 pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) |
319 searching for changes |
319 searching for changes |
320 no changes found |
320 no changes found |
321 pushing subrepo s to $TESTTMP/t/s (glob) |
321 pushing subrepo s to $TESTTMP/t/s (glob) |
322 searching for changes |
322 searching for changes |
323 abort: push creates new remote head 12a213df6fa9! |
323 abort: push creates new remote head 12a213df6fa9! (in subrepo s) |
324 (did you forget to merge? use push -f to force) |
324 (did you forget to merge? use push -f to force) |
325 [255] |
325 [255] |
326 $ hg push -f |
326 $ hg push -f |
327 pushing to $TESTTMP/t (glob) |
327 pushing to $TESTTMP/t (glob) |
328 pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) |
328 pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) |
585 $ hg -R repo2/s ci -m3 -A |
585 $ hg -R repo2/s ci -m3 -A |
586 adding b |
586 adding b |
587 created new head |
587 created new head |
588 $ hg -R repo2 ci -m3 |
588 $ hg -R repo2 ci -m3 |
589 $ hg -q -R repo2 push |
589 $ hg -q -R repo2 push |
590 abort: push creates new remote head cc505f09a8b2! |
590 abort: push creates new remote head cc505f09a8b2! (in subrepo s) |
591 (did you forget to merge? use push -f to force) |
591 (did you forget to merge? use push -f to force) |
592 [255] |
592 [255] |
593 $ hg -R repo update |
593 $ hg -R repo update |
594 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
594 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
595 |
595 |
597 |
597 |
598 $ echo issue3276_ok > repo/s/b |
598 $ echo issue3276_ok > repo/s/b |
599 $ hg -R repo2 push -f -q |
599 $ hg -R repo2 push -f -q |
600 $ hg -R repo update |
600 $ hg -R repo update |
601 b: untracked file differs |
601 b: untracked file differs |
602 abort: untracked files in working directory differ from files in requested revision |
602 abort: untracked files in working directory differ from files in requested revision (in subrepo s) |
603 [255] |
603 [255] |
604 |
604 |
605 $ cat repo/s/b |
605 $ cat repo/s/b |
606 issue3276_ok |
606 issue3276_ok |
607 $ rm repo/s/b |
607 $ rm repo/s/b |
643 adding manifests |
643 adding manifests |
644 adding file changes |
644 adding file changes |
645 added 2 changesets with 3 changes to 2 files |
645 added 2 changesets with 3 changes to 2 files |
646 (run 'hg update' to get a working copy) |
646 (run 'hg update' to get a working copy) |
647 $ hg -R issue1852b update |
647 $ hg -R issue1852b update |
648 abort: default path for subrepository sub/repo not found (glob) |
648 abort: default path for subrepository not found (in subrepo sub/repo) (glob) |
649 [255] |
649 [255] |
650 |
650 |
651 Pull -u now doesn't help |
651 Pull -u now doesn't help |
652 |
652 |
653 $ hg -R issue1852b pull -u issue1852a |
653 $ hg -R issue1852b pull -u issue1852a |