view tests/test-merge5 @ 546:c8ae964109c1

Add an empty line after description in verbose mode of show_changeset. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add an empty line after description in verbose mode of show_changeset. This makes it a little bit easier to see where a new changeset starts. manifest hash: dd0dc3a135ca2fabed03b86116863c93a451670d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCxOVgW7P1GVgWeRoRAjtdAJ9B/ECd/Rhws2Bd+IcwRyqcYEN0ugCfbug2 Uhy2yUhV+mlrqFkoNBkcOmM= =ttyp -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 01 Jul 2005 07:40:32 +0100
parents c2b9502a4e96
children 7e4843b7efd2
line wrap: on
line source

#!/bin/sh -x

mkdir t
cd t
hg init
echo This is file a1 > a
echo This is file b1 > b
hg add a b
hg commit -t "commit #0" -d "0 0" -u user
echo This is file b22 > b
hg commit -t"comment #1" -d "0 0" -u user
hg update 0
rm b
hg commit -A -t"comment #2" -d "0 0" -u user
# in theory, we shouldn't need the "yes k" below, but it prevents
# this test from hanging when "hg update" erroneously prompts the
# user for "keep or delete"
yes k | hg update 1
# we exit with 0 to avoid the unavoidable SIGPIPE from above causing
# us to fail this test
exit 0