Mercurial > hg > mercurial-crew

view tests/test-merge-force @ 10047:27267b1f68b4 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: rewrite several method docstrings - methods: findmissing(), nodesbetween(), descendants(), ancestors() - the goal is precise, concise, accurate, grammatical, understandable, consistently formatted docstrings
author Greg Ward <greg-hg@gerg.ca>
date Thu, 10 Dec 2009 09:35:43 -0500
parents 69c75d063c7a
children
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 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