view tests/test-merge4 @ 7178:98b6c3dde237

Fix Debian bug #494889 (fetching from static-http://... broken) Changeset 6605a03cbf87 which fixed issue965 (hg clone static-http does not work for empty repos) broke cloning of repos with old layout (without store) via static-http. This fix makes cloning from old-style repositories possible again, but will not allow cloning of empty old-style repositories as this can not be detected reliably.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 19 Oct 2008 19:49:56 +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"