/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

  • Committer: Jelmer Vernooij
  • Date: 2020-08-22 22:46:24 UTC
  • mfrom: (7490.40.105 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200822224624-om4a4idsr7cn8jew
merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_unversion.py
179
179
        if tree_b.has_versioned_directories():
180
180
            self.assertEqual(4, num_conflicts)
181
181
        else:
182
 
            self.assertEqual(3, num_conflicts)
 
182
            self.assertEqual(1, num_conflicts)
183
183
 
184
184
        self.assertThat(
185
185
            tree_b,