tests/test-issue322.out
author Brendan Cully <brendan@kublai.com>
Thu, 14 Sep 2006 19:24:00 -0700
changeset 3092 25857e00af8e
parent 2953 3d5547845158
child 5051 e3dffbdc6522
permissions -rw-r--r--
cat: default to working dir parent instead of tip This introduces a defaultrev function that chooses the working dir parent if a revision isn't specified, and uses it in several places.

% 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