equal
deleted
inserted
replaced
569 $ hg push |
569 $ hg push |
570 pushing to $TESTTMP/t |
570 pushing to $TESTTMP/t |
571 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss |
571 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss |
572 pushing subrepo s to $TESTTMP/t/s |
572 pushing subrepo s to $TESTTMP/t/s |
573 searching for changes |
573 searching for changes |
574 abort: push creates new remote head 12a213df6fa9! (in subrepository "s") |
574 abort: push creates new remote head 12a213df6fa9 (in subrepository "s") |
575 (merge or see 'hg help push' for details about pushing new heads) |
575 (merge or see 'hg help push' for details about pushing new heads) |
576 [255] |
576 [255] |
577 $ hg push -f |
577 $ hg push -f |
578 pushing to $TESTTMP/t |
578 pushing to $TESTTMP/t |
579 pushing subrepo s/ss to $TESTTMP/t/s/ss |
579 pushing subrepo s/ss to $TESTTMP/t/s/ss |
1011 $ hg -R repo2/s ci -m3 -A |
1011 $ hg -R repo2/s ci -m3 -A |
1012 adding b |
1012 adding b |
1013 created new head |
1013 created new head |
1014 $ hg -R repo2 ci -m3 |
1014 $ hg -R repo2 ci -m3 |
1015 $ hg -q -R repo2 push |
1015 $ hg -q -R repo2 push |
1016 abort: push creates new remote head cc505f09a8b2! (in subrepository "s") |
1016 abort: push creates new remote head cc505f09a8b2 (in subrepository "s") |
1017 (merge or see 'hg help push' for details about pushing new heads) |
1017 (merge or see 'hg help push' for details about pushing new heads) |
1018 [255] |
1018 [255] |
1019 $ hg -R repo update |
1019 $ hg -R repo update |
1020 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1020 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1021 |
1021 |