← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

  • Committer: Robert Collins
  • Date: 2007-03-07 08:02:58 UTC
  • mfrom: (2255.2.239 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: robertc@robertcollins.net-20070307080258-fi172acyjga89fz5
(robertc) Merge dirstate and subtrees. (Robert Collins, Martin Pool, Aaaron Bentley, John A Meinel, James Westby)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
63
63
        file('hello.OTHER', 'w').write('hello world3')
64
64
        file('hello.sploo.BASE', 'w').write('yellow world')
65
65
        file('hello.sploo.OTHER', 'w').write('yellow world2')
 
66
        tree.lock_read()
66
67
        self.assertEqual(len(list(tree.list_files())), 6)
 
68
        tree.unlock()
67
69
        conflicts = tree.conflicts()
68
70
        self.assertEqual(len(conflicts), 2)
69
71
        self.assert_('hello' in conflicts[0].path)