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.
.hgignore
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 10 Aug 2005 06:47:46 +0100
changeset 862 d70c1c31fd45
parent 850 d2bf8b9534b1
child 871 c2e77581bc84
child 874 d4cb383e7de7
child 894 62ec665759f2
child 896 01215ad04283
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:
717
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset 
     1
 
\.orig$
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset 
     2
 
\.rej$
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset 
     3
 
~$
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset 
     4
 
\.so$
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset 
     5
 
\.pyc$
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset 
     6
 
\.swp$
850
d2bf8b9534b1 Add temporary documentation files and profiling output to .hgignore
Samuel Tardieu <sam@rfc1149.net>
parents: 814
diff changeset 
     7
 
\.prof$
794
cdf61d3d3904 Ignore test error files, protect dot in .pc/
Thomas Arendsen Hein <thomas@intevation.de>
parents: 740
diff changeset 
     8
 
^tests/.*\.err$
717
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset 
     9
 
^build/
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset 
    10
 
^dist/
850
d2bf8b9534b1 Add temporary documentation files and profiling output to .hgignore
Samuel Tardieu <sam@rfc1149.net>
parents: 814
diff changeset 
    11
 
^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 
    12
 
^MANIFEST$
794
cdf61d3d3904 Ignore test error files, protect dot in .pc/
Thomas Arendsen Hein <thomas@intevation.de>
parents: 740
diff changeset 
    13
 
^\.pc/
717
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset 
    14
 
^patches/
a51e3ded642d Be even more specific with .hgignore regexps, added *.swp files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 716
diff changeset 
    15
 
^mercurial/__version__.py$
mercurial-crew-with-dirclash