view tests/test-issue322.out @ 9637:64425c5a9257

cmdutil: minor refactoring of changeset_printer._show - use ctx.branch() instead of directly accessing the extra field "branch" - move definitions of locals ('extra' and 'branch') down to where they are used
author Adrian Buehlmann <adrian@cadifra.com>
date Sat, 24 Oct 2009 19:01:40 +0200
parents e3dffbdc6522
children
line wrap: on
line source

% 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