Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4 @ 3022:d9b8d28c0b94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Find the system's MD5 binary. Different binaries calculate MD5 checksums on different systems. Try a couple known programs and only calculate and verify the checksum if they exist. This should silence warnings on eg OpenBSD.
author Will Maier <willmaier@ml1.net>
date Fri, 28 Jul 2006 13:46:19 -0500
parents e506c14382fd
children
line wrap: on
line source

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"