view tests/test-merge5 @ 2452:d1a7c8a5b835

Emacs: use delete-region instead of kill-* functions. This patch eliminates `kill-line' which taints kill-ring, and `kill-entire-line' which is specific for XEmacs.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 17 Jun 2006 00:06:28 +0900
parents 39eb64b23cb5
children 41989e55fa37
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