Mercurial > hg
diff tests/test-mq-safety.out @ 12378:ab237534d800 stable
mq: always require --force when pushing patches (issue2363)
--force was not necessary when passing --rev since 55578a8d7e84, but this
behaviour is usually harmful when branch names are passed instead of explicit
revisions.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 22 Sep 2010 23:51:10 +0200 |
parents | 6e65b451b62e |
children |
line wrap: on
line diff
--- a/tests/test-mq-safety.out Tue Sep 21 23:14:58 2010 +0200 +++ b/tests/test-mq-safety.out Wed Sep 22 23:51:10 2010 +0200 @@ -45,3 +45,36 @@ applying qp now at: qp +% testing applied patches, push and --force +adding a +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +marked working directory as branch branch +adding b +0 files updated, 0 files merged, 1 files removed, 0 files unresolved +requesting all changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +updating to branch default +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +% pushing applied patch with --rev without --force +pushing to ../forcepush2 +abort: source has mq patches applied +% pushing applied patch with branchhash, without --force +pushing to ../forcepush2 +abort: source has mq patches applied +% pushing revs excluding applied patch +pushing to ../forcepush2 +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +% pushing applied patch with --force +pushing to ../forcepush2 +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files (+1 heads)