Mercurial > hg

comparison tests/test-merge-commit @ 8523:5b7da468531b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: replace #...# syntax with {...}
author Martin Geisler <mg@lazybytes.net>
date Tue, 19 May 2009 23:02:17 +0200
parents 6c82beaaa11a
children
comparison
equal deleted inserted replaced
8522:39fd67552297 8523:5b7da468531b
31 hg up -C 2 31 hg up -C 2
32 rm bar 32 rm bar
33 echo line1 > bar 33 echo line1 > bar
34 hg ci -m '4: revert content change from rev 2' 34 hg ci -m '4: revert content change from rev 2'
35 35
36 hg log --template '#rev#:#node|short# #parents#\n' 36 hg log --template '{rev}:{node|short} {parents}\n'
37 echo '% this should use bar@rev2 as the ancestor' 37 echo '% this should use bar@rev2 as the ancestor'
38 hg --debug merge 3 38 hg --debug merge 3
39 echo '% contents of bar should be line1 line2' 39 echo '% contents of bar should be line1 line2'
40 cat bar 40 cat bar
41 hg ci -m '5: merge' 41 hg ci -m '5: merge'
62 hg up -C 2 62 hg up -C 2
63 rm bar 63 rm bar
64 echo line1 > bar 64 echo line1 > bar
65 hg ci -m '4: revert content change from rev 2' 65 hg ci -m '4: revert content change from rev 2'
66 66
67 hg log --template '#rev#:#node|short# #parents#\n' 67 hg log --template '{rev}:{node|short} {parents}\n'
68 echo '% this should use bar@rev2 as the ancestor' 68 echo '% this should use bar@rev2 as the ancestor'
69 hg --debug merge 3 69 hg --debug merge 3
70 echo '% contents of bar should be line1 line2' 70 echo '% contents of bar should be line1 line2'
71 cat bar 71 cat bar
72 hg ci -m '5: merge' 72 hg ci -m '5: merge'