Mercurial > hg
diff tests/test-up-local-change @ 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 | eb46971fc57f |
children | 6592c4f5cd4f 445970ccf57a |
line wrap: on
line diff
--- a/tests/test-up-local-change Thu Jul 21 12:40:28 2005 -0500 +++ b/tests/test-up-local-change Thu Jul 21 15:05:17 2005 -0500 @@ -1,14 +1,12 @@ #!/bin/sh -export HGMERGE=true - set -ex mkdir r1 cd r1 hg init echo a > a hg addremove -hg commit -t "1" -u test -d "0 0" +hg commit -m "1" -d "0 0" hg clone . ../r2 cd ../r2 @@ -21,7 +19,7 @@ echo b > b echo a2 > a hg addremove -hg commit -t "2" -u test -d "0 0" +hg commit -m "2" -d "0 0" cd ../r2 hg -q pull ../r1