Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5 @ 541:abaea35387a8
Added support for hg:// and old-http:// to 'hg clone'.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Added support for hg:// and old-http:// to 'hg clone'.
manifest hash: 4292cc7927afbec5663b5fff4317a238fb65cdec
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCw44lW7P1GVgWeRoRArWzAJ9AjiCF7poldqFxshV+lAyHZKy2PACgpCt1
KTdmdp+AL6m953NnYc5QNbo=
=BWbr
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 30 Jun 2005 07:16:05 +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