view tests/test-rebuildstate @ 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 ffeb926d57ce
children
line wrap: on
line source

#!/bin/sh
# basic test for hg debugrebuildstate

hg init repo
cd repo

touch foo bar
hg ci -Am 'add foo bar'

touch baz
hg add baz
hg rm bar

hg debugrebuildstate
echo '% state dump after'
hg debugstate --nodates | sort
echo '% status'
hg st -A