Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
MANIFEST.in
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 10 Aug 2005 06:47:46 +0100
changeset 862 d70c1c31fd45
parent 814 0902ffece4b4
child 950 fbaf0380efd1
child 953 52d8d81e72ad
child 981 4f81068ed8cd
permissions -rw-r--r--
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7
510265b68bbf Add MANIFEST.in to repo
mpm@selenic.com
parents:
diff changeset 
     1
 
include hg
510265b68bbf Add MANIFEST.in to repo
mpm@selenic.com
parents:
diff changeset 
     2
 
recursive-include mercurial *.py
188
f40273b0ad7b Mercurial 0.5
mpm@selenic.com
parents: 7
diff changeset 
     3
 
include hgweb.cgi
589
4be4d4580467 [PATCH] bring MANIFEST.in up to date
mpm@selenic.com
parents: 457
diff changeset 
     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
510265b68bbf Add MANIFEST.in to repo
mpm@selenic.com
parents:
diff changeset 
     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
f40273b0ad7b Mercurial 0.5
mpm@selenic.com
parents: 7
diff changeset 
     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
510265b68bbf Add MANIFEST.in to repo
mpm@selenic.com
parents:
diff changeset 
    12
 
include README
589
4be4d4580467 [PATCH] bring MANIFEST.in up to date
mpm@selenic.com
parents: 457
diff changeset 
    13
 
include CONTRIBUTORS
4be4d4580467 [PATCH] bring MANIFEST.in up to date
mpm@selenic.com
parents: 457
diff changeset 
    14
 
include COPYING
4be4d4580467 [PATCH] bring MANIFEST.in up to date
mpm@selenic.com
parents: 457
diff changeset 
    15
 
include TODO
4be4d4580467 [PATCH] bring MANIFEST.in up to date
mpm@selenic.com
parents: 457
diff changeset 
    16
 
include MANIFEST.in
Mercurial