view tests/test-merge4 @ 9811:c92ac5a56f69

buildrpm: enable to start the script from anywhere Previously the script worked only from the hg root.
author Gilles Moris <gilles.moris@free.fr>
date Fri, 06 Nov 2009 09:35:38 +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"