Mercurial > hg-stable

view tests/test-up-local-change @ 713:7c385bd5f993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added missing newline after two error messages. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Added missing newline after two error messages. manifest hash: c730cdf92c66ee5b44a4cd9b67f72deb844e4010 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC2B0mW7P1GVgWeRoRAjXJAJ48fbg6jXN65pBPGW/YmWn9OtKakACgjnr9 DPySaeLr3/bU7KhFdZPI7/4= =Lvsx -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 15 Jul 2005 21:31:35 +0100
parents eb46971fc57f
children 7e4843b7efd2
line wrap: on
line source

#!/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 --debug up
hg --debug up -m
hg parents
hg -v history
hg diff > ../d
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d