Corrected "waiting for lock on repository FOO held by BAR" message.
BAR was the error number and not the locker name.
Use repr on BAR, so problems can be detected easier.
% file replaced with directory
adding a
% should fail - would corrupt dirstate
abort: file named 'a' already in dirstate
% directory replaced with file
adding a/a
% should fail - would corrupt dirstate
abort: directory named 'a' already in dirstate
% directory replaced with file
adding b/c/d
% should fail - would corrupt dirstate
abort: directory named 'b' already in dirstate