view tests/test-revlog-group-emptyiter @ 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

# issue 1678

echo "# -- setting up base repo"
hg init a
cd a
touch a
hg ci -Am a
cd ..

echo "# -- cloning base repo"
hg clone a b
cd b

echo "# -- setting up cset to push"
hg up null
touch a
hg ci -Am b # different msg so we get a clog new entry

echo "# -- pushing"
hg push -f ../a