Mercurial > hg
view tests/test-issue322.out @ 6298:53cbb33e1269
normallookup: during merges, restore the state saved by remove
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 18 Mar 2008 04:07:39 -0300 |
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