tests/test-rename-dir-merge2
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Thu, 27 Aug 2009 14:15:04 +0200
changeset 9427 d37c0f4e8f48
parent 4115 c95060a5391a
permissions -rwxr-xr-x
parsers.c: parse_manifest: fixing refcount of flags When flags was DECREF'ed, scope was referencing to the outer variable, outside of the block. It was in fact always NULL: the real Python object was never decref'ed.

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