Mercurial > hg > pyhgsh

comparison tests/test-merge7 @ 2283:e506c14382fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
deprecate 'update -m'. use 'merge' instead.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sun, 14 May 2006 21:07:34 -0700
parents 7544700fd931
children
comparison
equal deleted inserted replaced
2282:2efa636eb411 2283:e506c14382fd
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 update -m 38 HGMERGE=merge 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 update --debug -m 60 HGMERGE=merge hg merge --debug
61 61
62 cat test.txt | sed "s% .*%%" 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