Mercurial > hg
view tests/test-merge5 @ 470:0ab093b473c5
Fix up version module name and command conflict
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix up version module name and command conflict
This unties the command name from the function name
manifest hash: 926d097f75cbb5eb2464bb253e9a89050c6208bd
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCvRLnywK+sNU5EO8RAvryAJ9RU0PLFOXjjtQjs8UVyOC9wde69gCgrV+G
8jYfMyWwvwsmOM7wMblPGqM=
=Acyk
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sat, 25 Jun 2005 00:16:39 -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