Mercurial > hg
view tests/test-issue660.out @ 5488:247af577fe29
fix typo in convert help text, update test
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Mon, 05 Nov 2007 20:15:33 +0100 |
parents | 7a64931e2d76 |
children | f252ba975925 |
line wrap: on
line source
adding a adding b/b % file replaced with directory % should fail - would corrupt dirstate abort: file 'a' in dirstate clashes with 'a/a' % removing shadow % should succeed - shadow removed % directory replaced with file % should fail - would corrupt dirstate abort: directory 'b' already in dirstate % removing shadow % should succeed - shadow removed % look what we got A a/a A b R a R b/b % revert reintroducing shadow - should fail abort: file 'b' in dirstate clashes with 'b/b' % revert all - should succeed undeleting a forgetting a/a forgetting b undeleting b/b % addremove removing a adding a/a adding b removing b/b A a/a A b R a R b/b % commit C a/a C b % long directory replaced with file adding d/d/d % should fail - would corrupt dirstate abort: directory 'd' already in dirstate % removing shadow % should succeed - shadow removed