view tests/test-merge5 @ 3589:1c9b6f1237e0

test for git empty new files
author Brendan Cully <brendan@kublai.com>
date Mon, 30 Oct 2006 16:14:38 -0800
parents 41989e55fa37
children fffc8a733bf9
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"

echo This is file a > a
# 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 # should fail (unclean repo)
hg revert a
hg update -y 1

exit 0