tests/test-merge5
author Brendan Cully <brendan@kublai.com>
Thu, 23 Aug 2007 13:59:52 -0700
changeset 5235 988ed47d9d65
parent 3592 fffc8a733bf9
child 6350 6aa4a3fa4e60
permissions -rwxr-xr-x
mq: some improvements to header rewriting (closes #690) Tested with qrefresh -m against the mm series.

#!/bin/sh

mkdir t
cd t
hg init
echo This is file a1 > a
echo This is file b1 > b
hg add a b
hg commit -m "commit #0" -d "1000000 0"
echo This is file b22 > b
hg commit -m"comment #1" -d "1000000 0"
hg update 0
rm b
hg commit -A -m"comment #2" -d "1000000 0"
# in theory, we shouldn't need the "-y" below, but it prevents
# this test from hanging when "hg update" erroneously prompts the
# user for "keep or delete"
hg update -y 1

exit 0