/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 bzrlib/tests/treeshape.py

  • 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:
bzrlib/tests/treeshape.py
41
41
 
42
42
    The template is built relative to the Python process's current
43
43
    working directory.
44
 
 
45
 
    ('foo/',) will build a directory.
46
 
    ('foo', 'bar') will write 'bar' to 'foo'
47
 
    ('foo@', 'linktarget') will raise an error
48
44
    """
49
45
    for tt in template:
50
46
        name = tt[0]