Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge9.out @ 5470:8374f3f081f2
tests: tidy up reporting of skipped tests
if not verbose:
- print 's' rather than '.'
- pass skipped test reports back to parent for -j
- report which tests were skipped at the end
- print '.' after test completion
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 19 Oct 2007 12:53:43 -0500 |
| parents | f191bc3916f7 |
| children |
line wrap: on
line source
adding bar adding foo adding quux1 adding quux2 merging bar merging bar failed! merging foo and baz merging baz failed! 1 files updated, 0 files merged, 0 files removed, 2 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 2 hg merge 1 3 files updated, 0 files merged, 1 files removed, 0 files unresolved merging bar merging bar failed! merging baz and foo merging baz failed! 1 files updated, 0 files merged, 0 files removed, 2 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 1 hg merge 2