/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 breezy/tests/per_workingtree/test_unversion.py

Split out bzr-specific Conflicts code.

Merged from https://code.launchpad.net/~jelmer/brz/conflict-refactor/+merge/388964

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_unversion.py
176
176
        # and removed, so 'a' needs to be restored. We also have a conflict
177
177
        # because 'a' is still an existing directory
178
178
        num_conflicts = tree_b.merge_from_branch(tree_a.branch)
179
 
        self.assertEqual(4, num_conflicts)
 
179
        if tree_b.has_versioned_directories():
 
180
            self.assertEqual(4, num_conflicts)
 
181
        else:
 
182
            self.assertEqual(3, num_conflicts)
180
183
 
181
184
        self.assertThat(
182
185
            tree_b,