Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-nested-repo @ 3257:c93ce7f10f85
merge: fixes for merge+rename
findcopies: ignore files renamed on both branches
applyupdates: change remove flag to move
recordupdates: record copy actions, including local moves and deletions
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 04 Oct 2006 19:08:04 -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