Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-excessive-merge @ 1948:ebe273a16048

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew/templates
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 13 Mar 2006 23:38:14 +0100
parents 7544700fd931
children e506c14382fd
comparison
equal deleted inserted replaced
1946:9fee186f7f0d 1948:ebe273a16048
4 4
5 echo foo > a 5 echo foo > a
6 echo foo > b 6 echo foo > b
7 hg add a b 7 hg add a b
8 8
9 hg ci -m "test" -d "0 0" 9 hg ci -m "test" -d "1000000 0"
10 10
11 echo blah > a 11 echo blah > a
12 12
13 hg ci -m "branch a" -d "0 0" 13 hg ci -m "branch a" -d "1000000 0"
14 14
15 hg co 0 15 hg co 0
16 16
17 echo blah > b 17 echo blah > b
18 18
19 hg ci -m "branch b" -d "0 0" 19 hg ci -m "branch b" -d "1000000 0"
20 HGMERGE=true hg up -m 1 20 HGMERGE=true hg up -m 1
21 21
22 hg ci -m "merge b/a -> blah" -d "0 0" 22 hg ci -m "merge b/a -> blah" -d "1000000 0"
23 23
24 hg co 1 24 hg co 1
25 HGMERGE=true hg up -m 2 25 HGMERGE=true hg up -m 2
26 hg ci -m "merge a/b -> blah" -d "0 0" 26 hg ci -m "merge a/b -> blah" -d "1000000 0"
27 27
28 hg log 28 hg log
29 hg debugindex .hg/00changelog.i 29 hg debugindex .hg/00changelog.i
30 30
31 echo 31 echo