Mercurial > hg
view tests/test-nested-repo @ 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 | c7e8fe11f34a |
children |
line wrap: on
line source
#!/bin/sh hg init a cd a hg init b echo x > b/x echo '# should print nothing' hg add b hg st echo '# should fail' hg st b/x hg add b/x echo '# should fail' hg add b b/x hg st echo '# should arguably print nothing' hg st b echo a > a hg ci -Ama a echo '# should fail' hg mv a b hg st