← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/tree_implementations/test_tree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-07-16 18:36:24 UTC
  • mfrom: (3514.2.19 weave_merge)
  • Revision ID: pqm@pqm.ubuntu.com-20080716183624-7yu6n1raw6sa4x80
(jam) Restore the real Weave merge for --format=weave.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/test_tree.py
56
56
        tree_b.lock_read()
57
57
        self.addCleanup(tree_b.unlock)
58
58
        self.assertEqual([
 
59
            ('killed-a', 'a\n'),
59
60
            ('killed-b', 'b\n'),
60
 
            ('killed-a', 'a\n'),
61
61
            ('unchanged', 'c\n'),
62
62
            ('unchanged', 'd\n'),
63
63
            ('new-a', 'e\n'),