← 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: Aaron Bentley
  • Date: 2007-07-23 14:51:48 UTC
  • mto: (1551.19.24 Aaron's mergeable stuff)
  • mto: This revision was merged to the branch mainline in revision 2649.
  • Revision ID: abentley@panoramicfeedback.com-20070723145148-5e1357oxg0ndevw4
Test that default behavior is as before

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
111
111
                         tree_conflicts.select_conflicts(tree, ['foo'],
112
112
                                                         recurse=True,
113
113
                                                         ignore_misses=True))
 
114
        self.assertEqual((tree_conflicts, ConflictList()),
 
115
                         tree_conflicts.select_conflicts(tree, ['foo'],
 
116
                                                         ignore_misses=True))
114
117
 
115
118
 
116
119
class TestConflictStanzas(TestCase):