Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge2 @ 563:42a6a41ab76b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[PATCH] clean up RPM spec file -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] clean up RPM spec file From: Bryan O'Sullivan <bos@serpentine.com> The current RPM spec file makes it impossible to split Mercurial into multiple interdependent packages. Here's a patch that fixes that problem. manifest hash: 4acc4c5cf4485d92a32d2259b83314b7167dece3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxb2+ywK+sNU5EO8RAnrTAJ4tkAh6xnHvRHMxzrfqKb/SXYS2wwCeMfK1 PAr+1FFoSqUmA9rt8Yaw6f4= =MaPn -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 01 Jul 2005 14:03:42 -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