Mercurial > hg > mercurial-crew-with-dirclash
annotate 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 |
rev | line source |
---|---|
7 | 1 include hg |
2 recursive-include mercurial *.py | |
188 | 3 include hgweb.cgi |
589 | 4 include hgeditor rewrite-log |
807
5e779f96edb0
Include tests (or possibly maps) ending in numbers in MANIFEST, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
806
diff
changeset
|
5 include tests/README tests/run-tests tests/test-*[a-z0-9] tests/*.out |
805
ec7107c5d8ad
Drop .err files generated by failed tests from the MANIFEST.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
740
diff
changeset
|
6 prune tests/*.err |
7 | 7 include *.txt |
807
5e779f96edb0
Include tests (or possibly maps) ending in numbers in MANIFEST, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
806
diff
changeset
|
8 include templates/map templates/map-*[a-z0-9] |
188 | 9 include templates/*.tmpl |
806
f4d5f6b97f77
Add Makefile from doc directory instead of / to MANIFEST.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
805
diff
changeset
|
10 include doc/README doc/*.txt doc/Makefile |
673
8e518e11f6cf
Change MANIFEST.in to recursive-include the contrib/ folder.
Andrew Thompson <andrewkt@aktzero.com>
parents:
589
diff
changeset
|
11 recursive-include contrib * |
7 | 12 include README |
589 | 13 include CONTRIBUTORS |
14 include COPYING | |
15 include TODO | |
16 include MANIFEST.in |