Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge2 @ 2252:ba7afc7dd901

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added tag 0.9 for changeset 35fb62a3a673d5322f6274a44ba6456e5e4b3b37
author Matt Mackall <mpm@selenic.com>
date Wed, 10 May 2006 16:55:55 -0500
parents 7544700fd931
children 9dcf9d45cab8
line wrap: on
line source

#!/bin/sh

mkdir t
cd t
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"
rm b
hg update 0
echo This is file b2 > b
hg add b
hg commit -m "commit #2" -d "1000000 0"
cd ..; /bin/rm -rf t

mkdir t
cd t
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"
rm b
hg update 0
echo This is file b2 > b
hg commit -A -m "commit #2" -d "1000000 0"
cd ..; /bin/rm -rf t

mkdir t
cd t
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"
rm b
hg remove b
hg update 0
echo This is file b2 > b
hg commit -A -m "commit #2" -d "1000000 0"
cd ..; /bin/rm -rf t