##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

issue1577: fix broken test by assuming less about CVS output....
issue1577: fix broken test by assuming less about CVS output. Specifically, output of "cvs ci" varies unpredictably across CVS versions, so any test that includes the output of "cvs ci" is doomed to fail some of the time. This fixes that by discarding the output of "cvs ci".
Matt Mackall - - Load All Authors

File last commit:

r5764:8a5d8fb5 default
r8081:6c3b8132 default
Show More
test-issue660.out
49 lines | 1.0 KiB | text/plain | TextLexer
/ tests / test-issue660.out
History | Annotation | Raw |Copy content |Copy permalink
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