Mercurial > hg
view tests/run-tests @ 407:0e0d0670b2bc
[PATCH] Merging identical changes from another branch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Merging identical changes from another branch
From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk>
The issue comes up when a local uncommitted *new* file (i.e. not in the
current manifest) is being merged with an identical file from a branch.
Since the file is not in the current manifest (it's either in the
current "to-be-added" list, or in the "unknown" state), there's no
(local) node from which to create a mergepoint.
manifest hash: 4e64ce654a6473524789a97bbaf8bff61b4343af
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuM/1ywK+sNU5EO8RAn7xAKCJoH/CgzVK4h4xPJDrd2lY9XOINACgmt01
92uuMswZXcoCchQAaxew7C0=
=qRsk
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 21 Jun 2005 18:41:57 -0800 |
parents | f060d728fe54 |
children | 688d03d6997a |
line wrap: on
line source
#!/bin/bash set -e tests=0 failed=0 H=$PWD TESTPATH=$PWD/install/bin export PATH=$TESTPATH:$PATH export PYTHONPATH=$PWD/install/lib/python rm -rf install cd .. ${PYTHON:-python} setup.py install --home=tests/install > tests/install.err if [ $? != 0 ] ; then cat tests/install.err fi cd $H rm install.err function run_one { rm -f $1.err export TZ=GMT D=`mktemp -d` if [ "$D" == "" ] ; then echo mktemp failed! fi cd $D fail=0 if ! $H/$1 > .out 2>&1 ; then echo $1 failed with error code $? fail=1 fi if [ -s .out -a ! -r $H/$1.out ] ; then echo $1 generated unexpected output: cat .out cp .out $H/$1.err fail=1 elif [ -r $H/$1.out ] && ! diff -u $H/$1.out .out > /dev/null ; then echo $1 output changed: diff -u $H/$1.out .out && true cp .out $H/$1.err fail=1 fi cd $H rm -r $D return $fail } TESTS=$@ if [ "$TESTS" == "" ] ; then TESTS=`ls test-* | grep -Ev "\.|~"` fi for f in $TESTS ; do echo -n "." if ! run_one $f ; then failed=$[$failed + 1] fi tests=$[$tests + 1] done rm -rf install echo echo Ran $tests tests, $failed failed if [ $failed -gt 0 ] ; then exit 1 fi