annotate tests/test-rename-dir-merge2 @ 7231:8e7130a10f3b

convert: ignore hg source errors with hg.ignoreerrors (issue 1357)

This flag makes missing revlog errors to be ignored which allow broken
repositories to be fixed by converting them from and to Mercurial.

#!/bin/sh

mkdir r1
cd r1
hg init
mkdir a
echo foo > a/f
hg add a
hg ci -m "a/f == foo"
cd ..

hg clone r1 r2
cd r2
hg mv a b
echo foo1 > b/f
hg ci -m" a -> b, b/f == foo1"
cd ..

cd r1
mkdir a/aa
echo bar > a/aa/g
hg add a/aa
hg ci -m "a/aa/g"
hg pull ../r2

hg merge

hg st -C