Mercurial > hg
view tests/test-issue842 @ 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 | 4b0c9c674707 |
children | cb93eee1fbcd |
line wrap: on
line source
hg init test cd test echo foo > a hg ci -Ama hg up -r0000 echo bar > a echo % should issue warning hg ci -Amb hg up -r0000 echo stuffy > a echo % should not issue warning hg ci -q -Amc hg up -r0000 echo crap > a hg branch testing echo % should not issue warning hg ci -q -Amd