test-issue660.out
42 lines
| 844 B
| text/plain
|
TextLexer
/ tests / test-issue660.out
|
r5487 | 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 | ||||