Mercurial > hg-stable
view tests/test-merge5 @ 428:183c87d4e1a0
Fix typo in merging new files
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix typo in merging new files
manifest hash: 4a6fee1e54c5c465a74f4d756a1ac549b15fdb2f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuOvVywK+sNU5EO8RArovAJ4ua9EhnO8wWfKRZ36E6F4Wrv5JPACghCXn
sHr/TSkxdy48OUVkhTbhhhQ=
=poww
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 21 Jun 2005 20:40:53 -0800 |
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