Mercurial > hg > pyhgsh

diff tests/test-merge2 @ 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 feadc9697b43
children ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4
line wrap: on
line diff
--- a/tests/test-merge2	Thu Jul 21 12:40:28 2005 -0500
+++ b/tests/test-merge2	Thu Jul 21 15:05:17 2005 -0500
@@ -5,15 +5,15 @@
 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"
 rm b
 hg update 0
 echo This is file b2 > b
 hg add b
-hg commit -t "commit #2" -d "0 0" -u user
+hg commit -m "commit #2" -d "0 0"
 cd ..; /bin/rm -rf t
 
 mkdir t
@@ -21,14 +21,14 @@
 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"
 rm b
 hg update 0
 echo This is file b2 > b
-hg commit -A -t "commit #2" -d "0 0" -u user
+hg commit -A -m "commit #2" -d "0 0"
 cd ..; /bin/rm -rf t
 
 mkdir t
@@ -36,13 +36,13 @@
 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"
 rm b
 hg remove b
 hg update 0
 echo This is file b2 > b
-hg commit -A -t "commit #2" -d "0 0" -u user
+hg commit -A -m "commit #2" -d "0 0"
 cd ..; /bin/rm -rf t