Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-issue322.out @ 5443:58496354773f
Merge with crew
Those crew folks are getting lazy about pulling from upstream before
committing.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 11 Oct 2007 00:46:40 -0500 |
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