tests/test-up-local-change
author mpm@selenic.com
Tue, 14 Jun 2005 13:44:37 -0800
changeset 332 6c869059beb4
parent 331 55f63f3b6a54
child 349 b2293093b89e
child 350 b4e0e20646bb
permissions -rwxr-xr-x
testing fixups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 testing fixups Add note about running tests to README Fix issue with pipelines and set -x output stability Add note about stability issue to README manifest hash: 7e8d9da463b3110664e24978550faab3ef67a706 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr0/FywK+sNU5EO8RAnWXAJ4toFrvgtsPfR3dYs9a81AsOrfiVQCfZKIf yJCboAnoJNSSjyUk42ALMxs= =YJ31 -----END PGP SIGNATURE-----

#!/bin/bash

export HGMERGE=true

set -ex
mkdir r1
cd r1
hg init
echo a > a
hg addremove
hg commit -t "1" -u test -d "0 0"

cd ..
mkdir r2
cd r2
hg init ../r1
hg up
echo abc > a
hg diff > ../d
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d

cd ../r1
echo b > b
echo a2 > a
hg addremove
hg commit -t "2" -u test -d "0 0"

cd ../r2
hg -q pull ../r1
hg status
hg -d up
hg -d up -m
hg parents
hg -v history
hg diff > ../d
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d