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.
Checked out revision 0.
A a
Adding a
Transmitting file data .
Committed revision 1.
% initial roundtrip
scanning source...
sorting...
converting...
0 added a
scanning source...
sorting...
converting...
% second roundtrip should do nothing
scanning source...
sorting...
converting...
scanning source...
sorting...
converting...
% new hg rev
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% adding an empty revision
% echo hg to svn
scanning source...
sorting...
converting...
1 b
0 emtpy
% svn back to hg should do nothing
scanning source...
sorting...
converting...
% hg back to svn should do nothing
scanning source...
sorting...
converting...