mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
084e15f969
Workaround for dir-changed-to-file updates mentioned in rev c3f3393b9096 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.
50 lines
1.0 KiB
Plaintext
50 lines
1.0 KiB
Plaintext
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
|