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.
% status without inotify
A a
! b
% inserve
% status
A a
! b
? hg.pid
Are we able to kill the service? if not, the service died on some error