← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

  • Committer: Aaron Bentley
  • Date: 2006-03-10 06:20:13 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: aaron.bentley@utoronto.ca-20060310062013-73726f82ca89344c
Conflict serialization working for WorkingTree3

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
200
200
        self.assertTrue(our_lock.peek())
201
201
        tree.unlock()
202
202
        self.assertEquals(our_lock.peek(), None)
 
203
 
 
204
    def make_tree(self):
 
205
        t = self.get_transport()
 
206
        url = self.get_url()
 
207
        dir = bzrdir.BzrDirMetaFormat1().initialize(url)
 
208
        repo = dir.create_repository()
 
209
        branch = dir.create_branch()
 
210
        return workingtree.WorkingTreeFormat3().initialize(dir)
 
211
 
 
212
    def test_conflicts(self):
 
213
        from bzrlib.tests.test_conflicts import example_conflicts
 
214
        tree = self.make_tree()
 
215
        tree.set_conflict_lines(example_conflicts)
 
216
        tree2 = WorkingTree.open('.')
 
217
        self.assertEqual(list(tree2.conflict_lines()), example_conflicts)