tests/test-merge4
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 24 Sep 2006 13:52:25 +0200
changeset 3152 d01e4cb2f5f2
parent 2283 e506c14382fd
permissions -rwxr-xr-x
cleanups in revlog.lookup - add comments - do a clean separation of the different cases - don't use a list of each possible node when doing the lookup, just keep the previous entry

#!/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"