tests/test-up-local-change
author mpm@selenic.com
Fri, 01 Jul 2005 14:46:31 -0800
changeset 568 e8fd41110dce
parent 547 4fc63e22b1fe
child 591 eb46971fc57f
permissions -rwxr-xr-x
[PATCH] Add tags to hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Add tags to hgweb From: Goffredo Baroncelli <kreijack@libero.it> manifest hash: 3a59c363799c974b042dbb55f943d830feb1b34f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxcfHywK+sNU5EO8RAgEKAJ40SRMOyBOkbS8QU2MIBUzBnhu5AwCbBDjR M+gaWyqzqOBzO1r+9zpb37k= =l1pL -----END PGP SIGNATURE-----

#!/bin/sh

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"

hg clone . ../r2
cd ../r2
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