tests/test-conflict
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 20 Jun 2006 14:57:30 -0300
changeset 2489 568e58eed096
parent 2283 e506c14382fd
child 4361 46280c004f22
permissions -rwxr-xr-x
Add revlog.parentrevs function. This allows one to walk the revision graph using only revision numbers, which can be faster than using revision hashes, especially for RevlogNG, where the parents of a revision are stored as revision numbers.

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
HGMERGE=merge; export HGMERGE
hg merge 1
hg id
egrep -v ">>>|<<<" a
hg status