annotate .hgignore @ 1542:333e056b3034

inhibit: make rebase see obsolescence even for visible nodes Rebase changed recently to take advantage of obsolescence markers to reduce the number of conflicts to resolve. Inhibit users were unable to leverage this new feature because none of their visible nodes could be obsolete. This patch makes the nodes that would be obsolete without inhibit, actually obsolete for the duration of the rebase to take advantage of the feature mentioned before.
author Laurent Charignon <lcharignon@fb.com>
date Mon, 30 Nov 2015 16:48:40 -0800
parents 41688ca951e7
children a7bad80b7700 854421a48e0c
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$
161
4e3f25ba5401 More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 149
diff changeset
3 ^docs/build/
233
9e153a9101c3 [doc] add a simple make file
Pierre-Yves.David@ens-lyon.org
parents: 222
diff changeset
4 ^docs/html/
242
1fc4299ca8e2 [doc] change doc generation directory
Pierre-Yves.David@ens-lyon.org
parents: 233
diff changeset
5 ^html/
262
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset
6 \.pyc$
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset
7 ~$
391
92adb5b34a04 .hgignore: ignore vi swap files
Patrick Mezard <patrick@mezard.eu>
parents: 262
diff changeset
8 \.swp$
262
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset
9 \.orig$
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset
10 \.rej$
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset
11 \.err$
422
cc8038e3bc23 hgignore: ignore the "common" tests/easy_run.sh file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 391
diff changeset
12 ^tests/easy_run.sh$
495
53ad6062f7cc Ignore build directory
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 422
diff changeset
13 ^build/
524
ba0a3d0f942f pkg: add proper MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 495
diff changeset
14 ^MANIFEST$
526
6194f7ee85dd hgignore: ignore compiled tutorials
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 524
diff changeset
15 ^docs/tutorials/.*\.rst$
557
41688ca951e7 doc: add a logo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 526
diff changeset
16 \.ico$