Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge2 @ 1904:a7e416bf3c1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improve templating. allow {foo} as well as #foo#. add new functions for changeset authors.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Mon, 27 Feb 2006 11:33:09 -0800
parents 0902ffece4b4
children 7544700fd931
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 "0 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "0 0"
rm b
hg update 0
echo This is file b2 > b
hg add b
hg commit -m "commit #2" -d "0 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 "0 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "0 0"
rm b
hg update 0
echo This is file b2 > b
hg commit -A -m "commit #2" -d "0 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 "0 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "0 0"
rm b
hg remove b
hg update 0
echo This is file b2 > b
hg commit -A -m "commit #2" -d "0 0"
cd ..; /bin/rm -rf t