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
mkdir t
cd t
hg init
echo a > a
hg add a
hg commit -m test -d "1000000 0"
hg history
hg manifest --debug
hg cat a
hg verify