test-excessive-merge
45 lines
| 521 B
| text/plain
|
TextLexer
/ tests / test-excessive-merge
|
r1716 | #!/bin/sh | |
hg init | |||
echo foo > a | |||
echo foo > b | |||
hg add a b | |||
|
r1933 | hg ci -m "test" -d "1000000 0" | |
|
r1716 | ||
echo blah > a | |||
|
r1933 | hg ci -m "branch a" -d "1000000 0" | |
|
r1716 | ||
hg co 0 | |||
echo blah > b | |||
|
r1933 | hg ci -m "branch b" -d "1000000 0" | |
|
r1716 | HGMERGE=true hg up -m 1 | |
|
r1933 | hg ci -m "merge b/a -> blah" -d "1000000 0" | |
|
r1716 | ||
hg co 1 | |||
HGMERGE=true hg up -m 2 | |||
|
r1933 | hg ci -m "merge a/b -> blah" -d "1000000 0" | |
|
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 | |||
hg verify |