Mercurial > evolve

annotate .hgignore @ 5787:32c0b2899fc4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
divergence-resolution: [patch 2] fix a messed up test case Because of logic change in divergence resolution which causes the order change in picking the resolution parent this test case was messed up. It was supposed to test that that it hits conflict while relocating the divergent cset but because of some change in previous patches, relocation went successful and it hits conflict while merging the two divergent csets. This patch, by making some changes in files content make sure that we get conflict during relocation.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 24 Jan 2021 20:09:02 +0530
parents aad37ffd7d58
children ba316ce15040
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
149
03f314e32058 import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
1 syntax: re
03f314e32058 import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
2 /figures/[^/]+\.png$
242
1fc4299ca8e2 [doc] change doc generation directory
Pierre-Yves.David@ens-lyon.org
parents: 233
diff changeset
3 ^html/
262
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset
4 \.pyc$
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset
5 ~$
391
92adb5b34a04 .hgignore: ignore vi swap files
Patrick Mezard <patrick@mezard.eu>
parents: 262
diff changeset
6 \.swp$
262
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset
7 \.orig$
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset
8 \.rej$
3203
34d5c97a3dee hgignore: fix .err matching patterns
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2080
diff changeset
9 ^tests/.*\.err$
422
cc8038e3bc23 hgignore: ignore the "common" tests/easy_run.sh file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 391
diff changeset
10 ^tests/easy_run.sh$
495
53ad6062f7cc Ignore build directory
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 422
diff changeset
11 ^build/
2080
b26a1f061ac8 hgignore: also ignore the 'dist' directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2020
diff changeset
12 ^dist/
524
ba0a3d0f942f pkg: add proper MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 495
diff changeset
13 ^MANIFEST$
526
6194f7ee85dd hgignore: ignore compiled tutorials
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 524
diff changeset
14 ^docs/tutorials/.*\.rst$
557
41688ca951e7 doc: add a logo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 526
diff changeset
15 \.ico$
1674
854421a48e0c hgignore: add an ignore rule for test timing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 557
diff changeset
16 tests/\.testtimes
3376
aad37ffd7d58 doc: import the training support
Boris Feld <boris.feld@octobus.net>
parents: 3203
diff changeset
17
aad37ffd7d58 doc: import the training support
Boris Feld <boris.feld@octobus.net>
parents: 3203
diff changeset
18 ^docs/training/graphs/
aad37ffd7d58 doc: import the training support
Boris Feld <boris.feld@octobus.net>
parents: 3203
diff changeset
19 ^docs/training/html/
aad37ffd7d58 doc: import the training support
Boris Feld <boris.feld@octobus.net>
parents: 3203
diff changeset
20 ^docs/training/index.html
aad37ffd7d58 doc: import the training support
Boris Feld <boris.feld@octobus.net>
parents: 3203
diff changeset
21 ^docs/training/graphviz-images/
aad37ffd7d58 doc: import the training support
Boris Feld <boris.feld@octobus.net>
parents: 3203
diff changeset
22 ^docs/training/img/
aad37ffd7d58 doc: import the training support
Boris Feld <boris.feld@octobus.net>
parents: 3203
diff changeset
23 ^docs/training/output/
aad37ffd7d58 doc: import the training support
Boris Feld <boris.feld@octobus.net>
parents: 3203
diff changeset
24 ^docs/training/pandocfilters/