test-excessive-merge
46 lines
| 522 B
| text/plain
|
TextLexer
/ tests / test-excessive-merge
Matt Mackall
|
r1716 | #!/bin/sh | ||
hg init | ||||
echo foo > a | ||||
echo foo > b | ||||
hg add a b | ||||
Thomas Arendsen Hein
|
r1933 | hg ci -m "test" -d "1000000 0" | ||
Matt Mackall
|
r1716 | |||
echo blah > a | ||||
Thomas Arendsen Hein
|
r1933 | hg ci -m "branch a" -d "1000000 0" | ||
Matt Mackall
|
r1716 | |||
hg co 0 | ||||
echo blah > b | ||||
Thomas Arendsen Hein
|
r1933 | hg ci -m "branch b" -d "1000000 0" | ||
Vadim Gelfer
|
r2283 | HGMERGE=true hg merge 1 | ||
Matt Mackall
|
r1716 | |||
Thomas Arendsen Hein
|
r1933 | hg ci -m "merge b/a -> blah" -d "1000000 0" | ||
Matt Mackall
|
r1716 | |||
hg co 1 | ||||
Vadim Gelfer
|
r2283 | HGMERGE=true hg merge 2 | ||
Thomas Arendsen Hein
|
r1933 | hg ci -m "merge a/b -> blah" -d "1000000 0" | ||
Matt Mackall
|
r1716 | |||
hg log | ||||
hg debugindex .hg/00changelog.i | ||||
echo | ||||
echo 1 | ||||
hg manifest 1 | ||||
echo 2 | ||||
hg manifest 2 | ||||
echo 3 | ||||
hg manifest 3 | ||||
echo 4 | ||||
hg manifest 4 | ||||
echo | ||||
hg debugindex .hg/data/a.i | ||||
Vadim Gelfer
|
r2283 | hg verify | ||