Mercurial > hg > pyhgsh
changeset 1963:39eb64b23cb5
Don't require the "yes" command for test-merge5.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 15 Mar 2006 11:26:57 +0100 |
| parents | 2a676ad52c22 |
| children | 778281d46bb2 |
| files | tests/test-merge5 |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge5 Wed Mar 15 11:09:24 2006 +0100 +++ b/tests/test-merge5 Wed Mar 15 11:26:57 2006 +0100 @@ -12,10 +12,9 @@ hg update 0 rm b hg commit -A -m"comment #2" -d "1000000 0" -# in theory, we shouldn't need the "yes k" below, but it prevents +# in theory, we shouldn't need the "-y" 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 +hg update -y 1 + exit 0