Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge5 @ 749:7e4843b7efd2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update tests to use commit -m and default -u manifest hash: 6e4385453843031a712005a320d6000595b40d05
author mpm@selenic.com
date Thu, 21 Jul 2005 15:05:17 -0500
parents c2b9502a4e96
children ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4
comparison
equal deleted inserted replaced
748:c5df1a9c5276 749:7e4843b7efd2
4 cd t 4 cd t
5 hg init 5 hg init
6 echo This is file a1 > a 6 echo This is file a1 > a
7 echo This is file b1 > b 7 echo This is file b1 > b
8 hg add a b 8 hg add a b
9 hg commit -t "commit #0" -d "0 0" -u user 9 hg commit -m "commit #0" -d "0 0"
10 echo This is file b22 > b 10 echo This is file b22 > b
11 hg commit -t"comment #1" -d "0 0" -u user 11 hg commit -m"comment #1" -d "0 0"
12 hg update 0 12 hg update 0
13 rm b 13 rm b
14 hg commit -A -t"comment #2" -d "0 0" -u user 14 hg commit -A -m"comment #2" -d "0 0"
15 # in theory, we shouldn't need the "yes k" below, but it prevents 15 # in theory, we shouldn't need the "yes k" 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 yes k | hg update 1
19 # we exit with 0 to avoid the unavoidable SIGPIPE from above causing 19 # we exit with 0 to avoid the unavoidable SIGPIPE from above causing