Mercurial > hg > mercurial-crew-with-dirclash
view MANIFEST.in @ 862:d70c1c31fd45
Fix 3-way-merge of original parent, workdir and new parent.
The dirstate has to match what is in the repository (what would be
checked out with 'hg update -C'), because the resulting file may be
identical to the new parent, or it may be completely different.
Previously the dirstate wasn't updated, so if you changed the file to
look like the original parent, it might be considered unmodified
relative to the new parent.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 10 Aug 2005 06:47:46 +0100 |
parents | 0902ffece4b4 |
children | fbaf0380efd1 52d8d81e72ad 4f81068ed8cd |
line wrap: on
line source
include hg recursive-include mercurial *.py include hgweb.cgi include hgeditor rewrite-log include tests/README tests/run-tests tests/test-*[a-z0-9] tests/*.out prune tests/*.err include *.txt include templates/map templates/map-*[a-z0-9] include templates/*.tmpl include doc/README doc/*.txt doc/Makefile recursive-include contrib * include README include CONTRIBUTORS include COPYING include TODO include MANIFEST.in