Mercurial > hg
view tests/test-issue660.out @ 11059:ef4aa90b1e58
Move 'findrenames' code into its own file.
The next few patches will increase the size of the "findrenames"
functionality. This patch simply moves the function into its own
file to avoid clutter building up in 'cmdutil.py'.
author | David Greenaway <hg-dev@davidgreenaway.com> |
---|---|
date | Sat, 03 Apr 2010 11:58:16 +1100 |
parents | 8a5d8fb59ed2 |
children |
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 % update should work at least with clean workdir 2 files updated, 0 files merged, 0 files removed, 0 files unresolved C a C b/b 2 files updated, 0 files merged, 0 files removed, 0 files unresolved C a/a C b