/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tools/rst2html.py

  • Committer: John Arbash Meinel
  • Date: 2008-03-04 14:25:46 UTC
  • mto: This revision was merged to the branch mainline in revision 3279.
  • Revision ID: john@arbash-meinel.com-20080304142546-zuwwy0o9roo14928
Implement cherrypick support for Merge3
When merging a cherrypick, use a slightly different resolve logic.
When encountering a conflict, the new logic does not include lines that
were present in BASE that are conflicting with OTHER.
This is done since a cherrypick is (by definition) avoiding changes that
are present in the base.
(related to bug #151731)

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/rst2html.py
19
19
import docutils
20
20
from docutils.core import publish_cmdline, default_description
21
21
 
22
 
if True: # this is still required in the distutils trunk as-at June 2008.
 
22
 
 
23
if docutils.__version__ <= '0.4.1':
23
24
    from docutils.parsers.rst.states import Body
24
25
    # we have some option names that contain dot; which is not allowed by
25
26
    # python-docutils 0.4-4 -- so monkeypatch in a better pattern