Mercurial > hg

view tests/test-merge2 @ 564:ced5f5ceb172

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[PATCH] Add contrib/buildrpm script -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Add contrib/buildrpm script From: Bryan O'Sullivan <bos@serpentine.com> Just run "buildrpm", and it builds an RPM for you. No funky monkey business required. manifest hash: b8fde5108b5cc8f49ce248d14ac2ee7ad004c91c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxb6sywK+sNU5EO8RApQZAJ94VD6NQr9l4Xx6w3S8EdpCIUuiIACfdoHA qnQWtMM+kqAzi3LnO92UYWE= =SWIO -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 01 Jul 2005 14:07:40 -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