tests/test-issue322.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 28 Apr 2007 17:55:45 -0300
changeset 4386 f9cd48bd8625
parent 2953 3d5547845158
child 5051 e3dffbdc6522
permissions -rw-r--r--
Fix minor mismerge. The caching of umask ended up being duplicated.

% 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