Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4 @ 3755:05120e210c65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use unsigned version format. This way can use one additional bit, and when encountering invalid revlogs with the first bit set don't produce python warnings or strange error messages.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 01 Dec 2006 23:27:53 +0100
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"