equal
deleted
inserted
replaced
514 pushing to $TESTTMP/t (glob) |
514 pushing to $TESTTMP/t (glob) |
515 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) |
515 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) |
516 pushing subrepo s to $TESTTMP/t/s |
516 pushing subrepo s to $TESTTMP/t/s |
517 searching for changes |
517 searching for changes |
518 abort: push creates new remote head 12a213df6fa9! (in subrepo s) |
518 abort: push creates new remote head 12a213df6fa9! (in subrepo s) |
519 (merge or see "hg help push" for details about pushing new heads) |
519 (merge or see 'hg help push' for details about pushing new heads) |
520 [255] |
520 [255] |
521 $ hg push -f |
521 $ hg push -f |
522 pushing to $TESTTMP/t (glob) |
522 pushing to $TESTTMP/t (glob) |
523 pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) |
523 pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) |
524 searching for changes |
524 searching for changes |
950 adding b |
950 adding b |
951 created new head |
951 created new head |
952 $ hg -R repo2 ci -m3 |
952 $ hg -R repo2 ci -m3 |
953 $ hg -q -R repo2 push |
953 $ hg -q -R repo2 push |
954 abort: push creates new remote head cc505f09a8b2! (in subrepo s) |
954 abort: push creates new remote head cc505f09a8b2! (in subrepo s) |
955 (merge or see "hg help push" for details about pushing new heads) |
955 (merge or see 'hg help push' for details about pushing new heads) |
956 [255] |
956 [255] |
957 $ hg -R repo update |
957 $ hg -R repo update |
958 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
958 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
959 |
959 |
960 test if untracked file is not overwritten |
960 test if untracked file is not overwritten |