view tests/test-up-local-change @ 483:27f5569a5814

Updated TODO -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Updated TODO manifest hash: c73376bc97920d14c8e29311a76313afd71ed457 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCvtiZW7P1GVgWeRoRAsdeAKCazz6dq6fiuq37FGsRKbavfW+4xwCeKbmG N7HBvJ71yVTX45heHiSh8c8= =AgqS -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 26 Jun 2005 17:32:25 +0100
parents b4e0e20646bb
children c5705ab9cebd
line wrap: on
line source

#!/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