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
hg init
mkdir alpha
touch alpha/one
mkdir beta
touch beta/two
hg add alpha/one beta/two
hg ci -m "start" -d "1000000 0"
echo 1 > alpha/one
echo 2 > beta/two
echo EVERYTHING
hg diff --nodates
echo BETA ONLY
hg diff --nodates beta
echo INSIDE BETA
cd beta
hg diff --nodates .