[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-----

#!/bin/sh

set -x
hg init
echo "nothing" > a
hg add a
hg commit -t ancestor -u test -d "0 0"
echo "something" > a
hg commit -t branch1 -u test -d "0 0"
hg co 0
echo "something else" > a
hg commit -t branch2 -u test -d "0 0"
export HGMERGE=merge
hg -d up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status