Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge7 @ 4361:46280c004f22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change tests to use simplemerge by default
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 16 Apr 2007 20:17:39 -0300
parents c0b449154a90
children 93a4e72b4f83
comparison
equal deleted inserted replaced
4360:d5c3a70f8422 4361:46280c004f22
33 EOF 33 EOF
34 hg commit -m "2 -> 2.5" -d "1000000 0" 34 hg commit -m "2 -> 2.5" -d "1000000 0"
35 35
36 # now pull and merge from test-a 36 # now pull and merge from test-a
37 hg pull ../test-a 37 hg pull ../test-a
38 HGMERGE=merge hg merge 38 hg merge
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
43 three 43 three
55 hg commit -m "two -> two-point-one" -d "1000000 0" 55 hg commit -m "two -> two-point-one" -d "1000000 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 ../test-a 59 hg pull ../test-a
60 HGMERGE=merge hg merge --debug 60 hg merge --debug
61 61
62 cat test.txt | sed "s% .*%%" 62 cat test.txt | sed "s% .*%%"
63 63
64 hg debugindex .hg/store/data/test.txt.i 64 hg debugindex .hg/store/data/test.txt.i
65 65