Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge2 @ 480:430a10669928

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed call to ui.warn() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed call to ui.warn() manifest hash: 3b82298c61822aaa41b4d9b579ec94a968a4b610 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvqpMW7P1GVgWeRoRAotJAKCKG1BH2RKobak9ebapjViN8cQI1ACgisqU jghqrq9978lFUA9zjA/N2eE= =g65B -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 26 Jun 2005 14:14:52 +0100
parents feadc9697b43
children 7e4843b7efd2
line wrap: on
line source

#!/bin/sh -x

mkdir t
cd t
hg init
echo This is file a1 > a
hg add a
hg commit -t "commit #0" -d "0 0" -u user
echo This is file b1 > b
hg add b
hg commit -t "commit #1" -d "0 0" -u user
rm b
hg update 0
echo This is file b2 > b
hg add b
hg commit -t "commit #2" -d "0 0" -u user
cd ..; /bin/rm -rf t

mkdir t
cd t
hg init
echo This is file a1 > a
hg add a
hg commit -t "commit #0" -d "0 0" -u user
echo This is file b1 > b
hg add b
hg commit -t "commit #1" -d "0 0" -u user
rm b
hg update 0
echo This is file b2 > b
hg commit -A -t "commit #2" -d "0 0" -u user
cd ..; /bin/rm -rf t

mkdir t
cd t
hg init
echo This is file a1 > a
hg add a
hg commit -t "commit #0" -d "0 0" -u user
echo This is file b1 > b
hg add b
hg commit -t "commit #1" -d "0 0" -u user
rm b
hg remove b
hg update 0
echo This is file b2 > b
hg commit -A -t "commit #2" -d "0 0" -u user
cd ..; /bin/rm -rf t