Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge5 @ 749:7e4843b7efd2
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 |
line wrap: on
line diff
--- a/tests/test-merge5 +++ b/tests/test-merge5 @@ -6,12 +6,12 @@ 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 +hg commit -m "commit #0" -d "0 0" echo This is file b22 > b -hg commit -t"comment #1" -d "0 0" -u user +hg commit -m"comment #1" -d "0 0" hg update 0 rm b -hg commit -A -t"comment #2" -d "0 0" -u user +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"