Mercurial > hg > mercurial-crew-with-dirclash
annotate .hgignore @ 990:5007e0bdeed2
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.
author | mpm@selenic.com |
---|---|
date | Sun, 21 Aug 2005 21:59:55 -0700 |
parents | 4f81068ed8cd |
children | fc3b41570082 |
rev | line source |
---|---|
947
4cabedfab66e
In-progress Emacs snapshot.
Bryan O'Sullivan <bos@serpentine.com>
parents:
896
diff
changeset
|
1 \.elc$ |
717
a51e3ded642d
Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
716
diff
changeset
|
2 \.orig$ |
a51e3ded642d
Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
716
diff
changeset
|
3 \.rej$ |
a51e3ded642d
Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
716
diff
changeset
|
4 ~$ |
a51e3ded642d
Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
716
diff
changeset
|
5 \.so$ |
a51e3ded642d
Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
716
diff
changeset
|
6 \.pyc$ |
a51e3ded642d
Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
716
diff
changeset
|
7 \.swp$ |
850
d2bf8b9534b1
Add temporary documentation files and profiling output to .hgignore
Samuel Tardieu <sam@rfc1149.net>
parents:
814
diff
changeset
|
8 \.prof$ |
794
cdf61d3d3904
Ignore test error files, protect dot in .pc/
Thomas Arendsen Hein <thomas@intevation.de>
parents:
740
diff
changeset
|
9 ^tests/.*\.err$ |
717
a51e3ded642d
Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
716
diff
changeset
|
10 ^build/ |
a51e3ded642d
Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
716
diff
changeset
|
11 ^dist/ |
850
d2bf8b9534b1
Add temporary documentation files and profiling output to .hgignore
Samuel Tardieu <sam@rfc1149.net>
parents:
814
diff
changeset
|
12 ^doc/.*\.[0-9](\.(x|ht)ml)?$ |
717
a51e3ded642d
Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
716
diff
changeset
|
13 ^MANIFEST$ |
794
cdf61d3d3904
Ignore test error files, protect dot in .pc/
Thomas Arendsen Hein <thomas@intevation.de>
parents:
740
diff
changeset
|
14 ^\.pc/ |
717
a51e3ded642d
Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
716
diff
changeset
|
15 ^patches/ |
a51e3ded642d
Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
716
diff
changeset
|
16 ^mercurial/__version__.py$ |