Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5 @ 805:ec7107c5d8ad
Drop .err files generated by failed tests from the MANIFEST.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 22:07:42 +0100 |
parents | ec85f9e6f3b1 |
children | 8f5637f0a0c0 |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo This is file a1 > a echo This is file b1 > b hg add a b hg commit -m "commit #0" -d "0 0" echo This is file b22 > b hg commit -m"comment #1" -d "0 0" hg update 0 rm b hg commit -A -m"comment #2" -d "0 0" # 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