← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to tools/rst2html.py

  • Committer: John Arbash Meinel
  • Date: 2008-07-09 21:42:24 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080709214224-r75k87r6a01pfc3h
Restore a real weave merge to 'bzr merge --weave'.

To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.

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