Mercurial > hg-stable
comparison tests/test-subrepo.t @ 19934:bfc6ed892349
push: hide description about "-f" in the hint to prevent from using it easily
"use push -f to force" in the hint at abortion of "hg push" may cause
novice users to execute "push -f" easily without understanding about
problems of multiple branch heads in the repository.
This patch hides description about "-f" in the hint, and leads into
seeing "hg help push" for details about pushing new heads.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Thu, 03 Oct 2013 23:16:06 +0900 |
parents | 5e10d41e7b9c |
children | 4c96c50ef937 |
comparison
equal
deleted
inserted
replaced
19933:621a26eb3a99 | 19934:bfc6ed892349 |
---|---|
315 pushing to $TESTTMP/t (glob) | 315 pushing to $TESTTMP/t (glob) |
316 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) | 316 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) |
317 pushing subrepo s to $TESTTMP/t/s | 317 pushing subrepo s to $TESTTMP/t/s |
318 searching for changes | 318 searching for changes |
319 abort: push creates new remote head 12a213df6fa9! (in subrepo s) | 319 abort: push creates new remote head 12a213df6fa9! (in subrepo s) |
320 (did you forget to merge? use push -f to force) | 320 (merge or see "hg help push" for details about pushing new heads) |
321 [255] | 321 [255] |
322 $ hg push -f | 322 $ hg push -f |
323 pushing to $TESTTMP/t (glob) | 323 pushing to $TESTTMP/t (glob) |
324 pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) | 324 pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) |
325 searching for changes | 325 searching for changes |
714 adding b | 714 adding b |
715 created new head | 715 created new head |
716 $ hg -R repo2 ci -m3 | 716 $ hg -R repo2 ci -m3 |
717 $ hg -q -R repo2 push | 717 $ hg -q -R repo2 push |
718 abort: push creates new remote head cc505f09a8b2! (in subrepo s) | 718 abort: push creates new remote head cc505f09a8b2! (in subrepo s) |
719 (did you forget to merge? use push -f to force) | 719 (merge or see "hg help push" for details about pushing new heads) |
720 [255] | 720 [255] |
721 $ hg -R repo update | 721 $ hg -R repo update |
722 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 722 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
723 | 723 |
724 test if untracked file is not overwritten | 724 test if untracked file is not overwritten |