Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge5 @ 1963:39eb64b23cb5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 7544700fd931
children 41989e55fa37
comparison
equal deleted inserted replaced
1962:2a676ad52c22 1963:39eb64b23cb5
10 echo This is file b22 > b 10 echo This is file b22 > b
11 hg commit -m"comment #1" -d "1000000 0" 11 hg commit -m"comment #1" -d "1000000 0"
12 hg update 0 12 hg update 0
13 rm b 13 rm b
14 hg commit -A -m"comment #2" -d "1000000 0" 14 hg commit -A -m"comment #2" -d "1000000 0"
15 # in theory, we shouldn't need the "yes k" below, but it prevents 15 # in theory, we shouldn't need the "-y" below, but it prevents
16 # this test from hanging when "hg update" erroneously prompts the 16 # this test from hanging when "hg update" erroneously prompts the
17 # user for "keep or delete" 17 # user for "keep or delete"
18 yes k | hg update 1 18 hg update -y 1
19 # we exit with 0 to avoid the unavoidable SIGPIPE from above causing 19
20 # us to fail this test
21 exit 0 20 exit 0