Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-nested-repo @ 3387:ba7c74081861
merge: update dirstate correctly for non-branchmerge updates
- we don't actually need the context in recordupdates
- use -1 for filesize to force check on normal update
- only record copy for branchmerges
- forget moved files on update
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 13 Oct 2006 17:58: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