Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge1 @ 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 5b22029b5aa2
children ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4
line wrap: on
line diff
--- a/tests/test-merge1
+++ b/tests/test-merge1
@@ -11,15 +11,15 @@ cd t
 hg init
 echo This is file a1 > a
 hg add a
-hg commit -t "commit #0" -d "0 0" -u user
+hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
-hg commit -t "commit #1" -d "0 0" -u user
+hg commit -m "commit #1" -d "0 0"
 
 hg update 0
 echo This is file c1 > c
 hg add c
-hg commit -t "commit #2" -d "0 0" -u user
+hg commit -m "commit #2" -d "0 0"
 echo This is file b1 > b
 env HGMERGE=../merge hg update -m 1
 # no merges expected
@@ -30,15 +30,15 @@ cd t
 hg init
 echo This is file a1 > a
 hg add a
-hg commit -t "commit #0" -d "0 0" -u user
+hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
-hg commit -t "commit #1" -d "0 0" -u user
+hg commit -m "commit #1" -d "0 0"
 
 hg update 0
 echo This is file c1 > c
 hg add c
-hg commit -t "commit #2" -d "0 0" -u user
+hg commit -m "commit #2" -d "0 0"
 echo This is file b2 > b
 env HGMERGE=../merge hg update -m 1
 # merge of b expected
@@ -49,16 +49,16 @@ cd t
 hg init
 echo This is file a1 > a
 hg add a
-hg commit -t "commit #0" -d "0 0" -u user
+hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
-hg commit -t "commit #1" -d "0 0" -u user
+hg commit -m "commit #1" -d "0 0"
 echo This is file b22 > b
-hg commit -t "commit #2" -d "0 0" -u user
+hg commit -m "commit #2" -d "0 0"
 hg update 1
 echo This is file c1 > c
 hg add c
-hg commit -t "commit #3" -d "0 0" -u user
+hg commit -m "commit #3" -d "0 0"
 cat b
 echo This is file b22 > b
 env HGMERGE=../merge hg update -m 2
@@ -70,16 +70,16 @@ cd t
 hg init
 echo This is file a1 > a
 hg add a
-hg commit -t "commit #0" -d "0 0" -u user
+hg commit -m "commit #0" -d "0 0"
 echo This is file b1 > b
 hg add b
-hg commit -t "commit #1" -d "0 0" -u user
+hg commit -m "commit #1" -d "0 0"
 echo This is file b22 > b
-hg commit -t "commit #2" -d "0 0" -u user
+hg commit -m "commit #2" -d "0 0"
 hg update 1
 echo This is file c1 > c
 hg add c
-hg commit -t "commit #3" -d "0 0" -u user
+hg commit -m "commit #3" -d "0 0"
 echo This is file b33 > b
 env HGMERGE=../merge hg update -m 2
 # merge of b expected