view tests/test-up-issue1456 @ 9954:d6a307719ccb stable

fix bug in prepush logic involving merge changesets

When creating new branches and merging them into existing ones, you would
sometimes be able to push some changesets (the existing branches) without using
--force, even when that creates a new head on the remote.

A test which triggers the error has been added.

#!/bin/sh

rm -rf a
hg init a
cd a

echo foo > foo
hg ci -qAm0
chmod +x foo
hg ci -m1
hg co -q 0
echo dirty > foo
hg up -c
hg up -q
cat foo
hg st -A

echo '% validate update of standalone execute bit change'
hg up -C 0
chmod -x foo
hg ci -m removeexec
hg up -C 0
hg up
hg st