Mercurial > hg
view tests/test-issue322.out @ 7786:92455c1d6f83
rebase: pull --rebase updates if there is nothing to rebase
author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
---|---|
date | Sun, 18 Jan 2009 19:59:51 +0100 |
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