view tests/test-merge4 @ 532:2e9698a5c92c

clone: abort on pre-existing destination directory -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 clone: abort on pre-existing destination directory manifest hash: c1c205ea212ed73521cebe0524da364f40ebf387 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxCIjywK+sNU5EO8RArteAKCM7oPK+htBvhz7n0Eo//A1BuGRQwCfY1xL 7denU7OqsKUf9UKKkhbWLB8= =rhfi -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 30 Jun 2005 08:47:31 -0800
parents 5e9e8b8d2629
children 7e4843b7efd2
line wrap: on
line source

#!/bin/sh -x

hg init
echo This is file a1 > a
hg add a
hg commit -t "commit #0" -d "0 0" -u user
echo This is file b1 > b
hg add b
hg commit -t "commit #1" -d "0 0" -u user
hg update 0
echo This is file c1 > c
hg add c
hg commit -t "commit #2" -d "0 0" -u user
hg update -m 1
rm b
echo This is file c22 > c
hg commit -t "commit #3" -d "0 0" -u user