##// 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".
Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default
r8081:6c3b8132 default
Show More
test-merge-force.out
11 lines | 298 B | text/plain | TextLexer
/ tests / test-merge-force.out
History | Source | Raw |Copy content |Copy permalink
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Alexis S. L. Carvalho
add a test for a375ffc2aa1b
 r6255 % local deleted a file, remote removed
Alexis S. L. Carvalho
merge: require --force when there are deleted files
 r6256 abort: outstanding uncommitted changes
Alexis S. L. Carvalho
add a test for a375ffc2aa1b
 r6255 resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should show a as removed
R a
% manifest. should not have a:
b