tests/test-issue322.out
author Yuya Nishihara <yuya@tcha.org>
Tue, 18 May 2010 18:55:14 +0900
changeset 11207 1d714c1546b5
parent 5051 e3dffbdc6522
permissions -rw-r--r--
color: bring back colors with pager It's introduced by 3c368a1c962d, but missing in merge changeset at a890cc501501.

% 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