view tests/test-backwards-remove @ 1581:db10b7114de0

abort when merging two heads and repository has local changes
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 14 Dec 2005 22:19:03 -0600
parents 0902ffece4b4
children 7544700fd931
line wrap: on
line source

#!/bin/sh
hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
ls
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "0 0"
hg co 0
# B should disappear
ls