Mercurial > hg
view tests/test-issue660.out @ 5762:c2a21fe60994
"C" status code considered harmful, so changed to "=" (issue899)
C means conflict in other SCMs, and = is more intuitive anyway.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 30 Dec 2007 17:45:26 +0100 |
parents | f252ba975925 |
children | 8a5d8fb59ed2 |
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 = a/a = 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 % update should work at least with clean workdir 2 files updated, 0 files merged, 0 files removed, 0 files unresolved = a = b/b 2 files updated, 0 files merged, 0 files removed, 0 files unresolved = a/a = b