view .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
line wrap: on
line source

syntax: re
/figures/[^/]+\.png$
^docs/build/
^docs/html/
^html/
\.pyc$
~$
\.swp$
\.orig$
\.rej$
\.err$
^tests/easy_run.sh$
^build/
^MANIFEST$
^docs/tutorials/.*\.rst$
\.ico$