/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/bzr_epydoc

  • Committer: John Arbash Meinel
  • Date: 2009-04-29 17:02:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4322.
  • Revision ID: john@arbash-meinel.com-20090429170236-v1oe7b235mi73cqs
https://launchpad.net/bugs/328171
Add a per-implementation test that deleting lines conflicts with modifying lines.

At the moment, I don't see a simple way to implement this for LCA merge,
so I'm just marking it as 'expectedFailure'.
However, it works for both Weave merge and for Merge3.
Fixes bug #328171

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/bzr_epydoc
 
1
#!/usr/bin/env python
 
2
#
 
3
# Call the command line interface for Epydoc.
 
4
#
 
5
 
 
6
"""Wrapper around Epydoc that just makes it understand bzr's lazy imports."""
 
7
 
 
8
# This will enable the lazy_import compatibility code
 
9
import bzr_epydoc_uid
 
10
 
 
11
from epydoc.cli import cli
 
12
cli()
 
13
 
 
14