comparison tests/test-mq-safety @ 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.

12360:4ae3e5dffa60

hg merge default
hg ci -mmerge
hg up default
hg log
hg qpush

12378:ab237534d800

hg merge default
hg ci -mmerge
hg up default
hg log
hg qpush
cd ..

echo '% testing applied patches, push and --force'
hg init forcepush
cd forcepush
echo a > a
hg ci -Am adda
echo a >> a
hg ci -m changea
hg up 0
hg branch branch
echo b > b
hg ci -Am addb
hg up 0
hg --cwd .. clone -r 0 forcepush forcepush2
echo a >> a
hg qnew patch
echo '% pushing applied patch with --rev without --force'
hg push -r default ../forcepush2
echo '% pushing applied patch with branchhash, without --force'
hg push ../forcepush2#default
echo '% pushing revs excluding applied patch'
hg push --new-branch -r branch -r 2 ../forcepush2
echo '% pushing applied patch with --force'
hg push --force -r default ../forcepush2
cd ..