view tests/test-issue1175 @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.
author Augie Fackler <durin42@gmail.com>
date Wed, 04 Mar 2009 13:06:16 -0600
parents 0d714a48ab53
children
line wrap: on
line source

#!/bin/sh
rm -rf a
hg init a
cd a
touch a
hg ci -Am0
hg mv a a1
hg ci -m1
hg co 0
hg mv a a2
hg up
hg ci -m2

touch a
hg ci -Am3
hg mv a b
hg ci -Am4 a
hg ci --debug --traceback -Am5 b
hg verify
hg export --git tip