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
# Source bundle was generated with the following script.
#
# hg init
# echo a > a
# ln -s a l
# hg ci -Ama -d'0 0'
# mkdir b
# echo a > b/a
# chmod +x b/a
# hg ci -Amb -d'1 0'
hg init
hg -q pull "$TESTDIR/test-manifest.hg"
echo % should be empty
hg manifest
hg co
hg manifest
hg manifest -v
hg manifest --debug
hg manifest -r 0
hg manifest -r 1
hg manifest -r tip
echo % should fail
hg manifest -r 2
hg manifest -r tip tip
hg manifest tip