view tests/test-merge5 @ 5032:6dbd40b6307c

Update expected test output It's no longer a "problem" to have the same name listed with no prefix and a "hgext." prefix.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 30 Jul 2007 20:48:50 -0700
parents fffc8a733bf9
children 6aa4a3fa4e60
line wrap: on
line source

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