Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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 mpm@selenic.com
Sun, 21 Aug 2005 21:59:55 -0700
changeset 990 5007e0bdeed2
parent 981 4f81068ed8cd
child 1007 2e8d96e89dfc
permissions -rw-r--r--
Fix long-standing excessive file merges Since switching to the multihead approach, we've been creating excessive file-level merges where files are marked as merged with their ancestors. This explicitly checks at commit time whether the two parent versions are linearly related, and if so, reduces the file check-in to a non-merge. Then the file is compared against the remaining parent, and, if equal, skips check-in of that file (as it's not changed). Since we're not checking in all files that were different between versions, we no longer need to mark so many files for merge. This removes most of the 'm' state marking as well. Finally, it is possible to do a tree-level merge with no file-level changes. This will happen if one user changes file A and another changes file B. Thus, if we have have two parents, we allow commit to proceed even if there are no file-level changes.
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
954
f179a3a4af3c Add hgwebdir.cgi to MANIFEST.in
mpm@selenic.com
parents: 953
diff changeset 
     3
 
include hgweb.cgi hgwebdir.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 MANIFEST.in
mercurial-crew-with-dirclash