view tests/test-conflict @ 489:a636f7d2cd5b

[PATCH] umask for run-tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] umask for run-tests From: Bryan O'Sullivan <bos@serpentine.com> Another local factor affecting test breakage: umask. Mine is 002, but some other people seem to use 022. This patch makes run-tests explicitly set a umask. manifest hash: 39aaea44746b113e992bcf0a9e93d9de3961c907 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwOz8ywK+sNU5EO8RAvr7AJ9gRknqzQD6UmV1SpzHGqQyclcuxgCeItoD W7yNbrtIAPyMJsfwhVECx3s= =KhYb -----END PGP SIGNATURE-----
author mpm@selenic.com
date Mon, 27 Jun 2005 22:23:56 -0800
parents ee4c80d294e5
children 3d4d5f2aba9a 4fc63e22b1fe
line wrap: on
line source

#!/bin/bash

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