Mercurial > hg
view tests/test-issue660.out @ 9857:24bc6e414610
diff: change --inverse to --reverse
This fixes an incompatibility with patch(1), which also uses --reverse
for reversed diffs. The --inverse flag was added in 3f522d2fa633. That
name was chosen over --reverse since it was thought that --reverse
would make --rev ambiguous.
It turns out that both flags can co-exist, with the cost that --rev
can no longer be shortened to --r and --re. Since one can always use
the short -r option, this is not a real problem.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sat, 14 Nov 2009 14:21:53 +0100 |
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