Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-nested-repo @ 4815:8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
don't allow merging with an ancestor
fix != on contexts
add a test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 05 Jul 2007 13:34:18 -0500 |
parents | 890e285c52a1 |
children | d316124ebbea |
line wrap: on
line source
#!/bin/sh hg init a cd a hg init b echo x > b/x echo '# should print nothing' hg st echo '# should print ? b/x' hg st b/x hg add b/x echo '# should print A b/x' hg st echo '# should forget b/x' hg revert --all echo '# should print nothing' hg st b