Mercurial > hg
view tests/test-diff-color @ 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 | 03dd55115985 |
children | c06e7581bbaa |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "color=" >> $HGRCPATH hg init repo cd repo cat > a <<EOF c c a a b a a c c EOF hg ci -Am adda cat > a <<EOF c c a a dd a a c c EOF echo '% default context' hg diff --nodates --color=always echo '% --unified=2' hg diff --nodates -U 2 --color=always