Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge4 @ 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 5e9e8b8d2629
children ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4
comparison
equal deleted inserted replaced
748:c5df1a9c5276 749:7e4843b7efd2
1 #!/bin/sh -x 1 #!/bin/sh -x
2 2
3 hg init 3 hg init
4 echo This is file a1 > a 4 echo This is file a1 > a
5 hg add a 5 hg add a
6 hg commit -t "commit #0" -d "0 0" -u user 6 hg commit -m "commit #0" -d "0 0"
7 echo This is file b1 > b 7 echo This is file b1 > b
8 hg add b 8 hg add b
9 hg commit -t "commit #1" -d "0 0" -u user 9 hg commit -m "commit #1" -d "0 0"
10 hg update 0 10 hg update 0
11 echo This is file c1 > c 11 echo This is file c1 > c
12 hg add c 12 hg add c
13 hg commit -t "commit #2" -d "0 0" -u user 13 hg commit -m "commit #2" -d "0 0"
14 hg update -m 1 14 hg update -m 1
15 rm b 15 rm b
16 echo This is file c22 > c 16 echo This is file c22 > c
17 hg commit -t "commit #3" -d "0 0" -u user 17 hg commit -m "commit #3" -d "0 0"