##// 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".
Adrian Buehlmann - - Load All Authors

File last commit:

r6338:0750f111 default
r8081:6c3b8132 default
Show More
test-pull-update.out
32 lines | 967 B | text/plain | TextLexer
/ tests / test-pull-update.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Update on pull -u when heads were closed (fixes issue666)....
 r5080 adding foo
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Thomas Arendsen Hein
Update on pull -u when heads were closed (fixes issue666)....
 r5080 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail
pulling from ../tt
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
not updating, since new heads added
(run 'hg heads' to see heads, 'hg merge' to merge)
% should fail
pulling from ../t
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
not updating, since new heads added
(run 'hg heads' to see heads, 'hg merge' to merge)
merging foo
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should work
pulling from ../tt
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (-1 heads)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved