tests/test-issue660.out
author Maxim Dounin <mdounin@mdounin.ru>
Wed, 07 Nov 2007 22:57:28 +0100
changeset 5516 f252ba975925
parent 5487 7a64931e2d76
child 5762 c2a21fe60994
permissions -rw-r--r--
Fix dir-changed-to-file updates on clean workdir. Workaround for dir-changed-to-file updates mentioned in rev 7a64931e2d76 doesn't actually work since tests introduced in mentioned changeset prevented dirstate updates even if working directory updates succeded. Make tests more relaxed for dirstate operations not directly accessible from cli. See also issue660. While here, move _dirs existance check from _decpath() to _changepath() for unification.

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