tests/test-dirstatedirs

prepush: add more precise error messages

Part of the patch is from [e-mail]

- 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

# test dirstate._dirs refcounting
hg init t
cd t
mkdir -p a/b/c/d
touch a/b/c/d/x
touch a/b/c/d/y
touch a/b/c/d/z
hg ci -Am m
hg mv a z