tests/test-merge4
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 24 Oct 2006 23:00:43 -0300
changeset 3508 0aef94f45ebf
parent 2283 e506c14382fd
permissions -rwxr-xr-x
revlog.py: always return tuples from parents and parentrevs There's at least one place doing parentrevs(rev) != (rev-1, -1), which is always true with revlog v0, since parentrevs returns a list in this case.

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"