2007-11-05 20:05:44 +03:00
|
|
|
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
|
2008-01-01 02:47:02 +03:00
|
|
|
C a/a
|
|
|
|
C b
|
2007-11-05 20:05:44 +03:00
|
|
|
% 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
|
2007-11-08 00:57:28 +03:00
|
|
|
% update should work at least with clean workdir
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2008-01-01 02:47:02 +03:00
|
|
|
C a
|
|
|
|
C b/b
|
2007-11-08 00:57:28 +03:00
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2008-01-01 02:47:02 +03:00
|
|
|
C a/a
|
|
|
|
C b
|