##// END OF EJS Templates
Fix Debian bug #494889 (fetching from static-http://... broken)...
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.

File last commit:

r5608:784eadab default
r7178:98b6c3dd default
Show More
test-rename-after-merge
34 lines | 450 B | text/plain | TextLexer
/ tests / test-rename-after-merge
Patrick Mezard
Test renaming files brought by merge second parent (issue 746)
r5318 #!/bin/sh
# Test issue 746: renaming files brought by the
# second parent of a merge was broken.
echo % create source repository
hg init t
cd t
echo a > a
hg ci -Am a
cd ..
echo % fork source repository
hg clone t t2
cd t2
echo b > b
hg ci -Am b
echo % update source repository
cd ../t
echo a >> a
hg ci -m a2
echo % merge repositories
hg pull ../t2
hg merge
Matt Mackall
copy: simplify inner copy...
r5608 hg st
Patrick Mezard
Test renaming files brought by merge second parent (issue 746)
r5318
echo % rename b as c
hg mv b c
hg st
echo % rename back c as b
hg mv c b
hg st