view tests/test-merge4 @ 9094:89ae64a4e2ec

transaction: fix uncaught ENOENT (issue1724) The opener raises an IOError on errors where transaction expects an OSError.
author Henrik Stuart <henrik.stuart@edlund.dk>
date Tue, 07 Jul 2009 19:24:52 +0200
parents e506c14382fd
children
line wrap: on
line source

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