Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4 @ 3543:f7dee427cd14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Turn of "Not trusting file" logging when running hgweb and hgwebdir (hg serve still shows the warning)
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 26 Oct 2006 19:25:45 +0200
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"