view tests/test-up-local-change @ 805:ec7107c5d8ad

Drop .err files generated by failed tests from the MANIFEST.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 29 Jul 2005 22:07:42 +0100
parents ec85f9e6f3b1
children 8f5637f0a0c0
line wrap: on
line source

#!/bin/sh

set -e
mkdir r1
cd r1
hg init
echo a > a
hg addremove
hg commit -m "1" -d "0 0"

hg clone . ../r2
cd ../r2
hg up
echo abc > a
hg diff > ../d
sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d

cd ../r1
echo b > b
echo a2 > a
hg addremove
hg commit -m "2" -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/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d