prepush: add more precise error messages
Part of the patch is from timeless@mozdev.org
- indicate the branch name where there are multiple heads
- give better advice when hitting a possible race, where new heads are added
between discovery and the call to branchmap(). In that case, asking the user
to merge isn't helpful, since only remote has the changes.
#!/bin/sh
cat >> $HGRCPATH <<EOF
[extensions]
hgcia=
[hooks]
changegroup.cia = python:hgext.hgcia.hook
[cia]
user = testuser
project = testproject
test = True
EOF
hg init src
hg init cia
cd src
echo foo > foo
hg ci -Amfoo
hg push ../cia