Mercurial > hg > pyhgsh

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