view tests/test-issue1438.out @ 8821:c66e324d3961

Fix test-convert-cvsnt-mergepoints so it works reliably. Specifically, always run 'cvs commit' with -f option to force commit; add one strategic sleep which seems to be necessary for post-merge clobber-and-commit (-f doesn't force a commit there?).
author Greg Ward <greg-hg@gerg.ca>
date Mon, 15 Jun 2009 20:35:19 -0400
parents 2c5b2abfb8be
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying bad.patch
R link
? bad.patch