Mercurial > hg

comparison tests/test-merge7 @ 1352:bf6c91cb816f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make test-merge7 repeatable
author Matt Mackall <mpm@selenic.com>
date Tue, 27 Sep 2005 14:53:11 -0700
parents 0e2be889ccd7
children 7544700fd931
comparison
equal deleted inserted replaced
1351:0e2be889ccd7 1352:bf6c91cb816f
32 3 32 3
33 EOF 33 EOF
34 hg commit -m "2 -> 2.5" -d "0 0" 34 hg commit -m "2 -> 2.5" -d "0 0"
35 35
36 # now pull and merge from test-a 36 # now pull and merge from test-a
37 hg pull 37 hg pull ../test-a
38 HGMERGE=merge hg update -m 38 HGMERGE=merge hg update -m
39 # resolve conflict 39 # resolve conflict
40 cat >test.txt <<"EOF" 40 cat >test.txt <<"EOF"
41 one 41 one
42 two-point-five 42 two-point-five
50 cat >test.txt <<"EOF" 50 cat >test.txt <<"EOF"
51 one 51 one
52 two-point-one 52 two-point-one
53 three 53 three
54 EOF 54 EOF
55 hg commit -m "two -> two-point-one" 55 hg commit -m "two -> two-point-one" -d "0 0"
56 56
57 # pull and merge from test-a again 57 # pull and merge from test-a again
58 cd ../test-b 58 cd ../test-b
59 hg pull 59 hg pull ../test-a
60 HGMERGE=merge hg update --debug -m 60 HGMERGE=merge hg update --debug -m
61 61
62 cat test.txt 62 cat test.txt | sed "s% .*%%"
63 63
64 hg debugindex .hg/data/test.txt.i 64 hg debugindex .hg/data/test.txt.i
65 65
66 hg log 66 hg log