Mercurial > hg

view tests/test-merge-force @ 6255:ae83d927c629

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add a test for a375ffc2aa1b
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 14 Mar 2008 09:56:58 -0300
parents
children 69c75d063c7a
line wrap: on
line source

#!/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 -v merge
echo % should show a as removed
hg st

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