view tests/test-hghave.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?).