annotate .hgignore @ 285:691cb55358b0

obsolete: do not obsolete rebase --detach nullmerge revs Rebase state contains the changesets to rebase as well as 'nullmerge' entries used drive the merge strategy. These nullmerge were not rebased and should be ignored, and certainly not be marked obsolete.
author Patrick Mezard <patrick@mezard.eu>
date Wed, 20 Jun 2012 14:43:20 +0200
parents 4675d9c6c66b
children 92adb5b34a04
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 ~$
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset
8 \.orig$
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset
9 \.rej$
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset
10 \.err$