tests/test-issue322.out
author Matt Mackall <mpm@selenic.com>
Sat, 07 Nov 2009 16:30:42 -0600
changeset 9780 1ee085511b89
parent 5051 e3dffbdc6522
permissions -rw-r--r--
subrepo: notice dirty subrepo states when merging

% file replaced with directory
adding a
% should fail - would corrupt dirstate
abort: file 'a' in dirstate clashes with 'a/a'
% directory replaced with file
adding a/a
% should fail - would corrupt dirstate
abort: directory 'a' already in dirstate
% directory replaced with file
adding b/c/d
% should fail - would corrupt dirstate
abort: directory 'b' already in dirstate