tests/test-merge4
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 22 Aug 2006 22:49:30 -0300
changeset 3011 01454af644b8
parent 2283 e506c14382fd
permissions -rwxr-xr-x
load extensions only after the ui object has been completely initialized This fixes a traceback printed when hg tries to print another traceback after an extension fails to be loaded. Add a test for that.

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