Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge2 @ 466:c084cfbb2389

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add hgmerge manpage -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add hgmerge manpage - From Vincent Danjean manifest hash: db96fb3109a588052b21e49df81cfe65c98e72d7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvQT2ywK+sNU5EO8RAmuFAJ0TFJ7K88OP/dMJVcFtD6Tiuon8SwCgl+W+ 4NgyQCJKwgfGF6nEhqJkgck= =Ymjz -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 24 Jun 2005 23:17:10 -0800
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