view tests/test-merge-force @ 7336:2dc868712dcc

hgweb: support for deny_read/allow_read options

reimplementation of a patch provided by Nilton Volpato.

Folded into a single patch by Thomas Arendsen Hein.

#!/bin/sh

hg init repo
cd repo

echo a > a
hg ci -qAm 'add a'

echo b > b
hg ci -qAm 'add b'

hg up -qC 0
hg rm a
hg ci -m 'rm a'

hg up -qC 1
rm a

echo '% local deleted a file, remote removed'
hg merge # should fail, since there are deleted files
hg -v merge --force
echo % should show a as removed
hg st

hg ci -m merge
echo % manifest. should not have a:
hg manifest