/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_commit.py

  • Committer: Jelmer Vernooij
  • Date: 2020-08-10 15:00:17 UTC
  • mfrom: (7490.40.99 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200810150017-vs7xnrd1vat4iktg
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_commit.py
102
102
        # Merging from A should introduce conflicts because 'n' was modified
103
103
        # (in A) and removed (in B), so 'a' needs to be restored.
104
104
        num_conflicts = tree_b.merge_from_branch(tree_a.branch)
105
 
        self.assertEqual(3, num_conflicts)
 
105
        if tree_b.has_versioned_directories():
 
106
            self.assertEqual(3, num_conflicts)
 
107
        else:
 
108
            self.assertEqual(2, num_conflicts)
106
109
 
107
110
        self.assertThat(
108
111
            tree_b, HasPathRelations(
113
116
        osutils.rmtree('B/a')
114
117
        try:
115
118
            # bzr resolve --all
116
 
            tree_b.set_conflicts(conflicts.ConflictList())
 
119
            tree_b.set_conflicts([])
117
120
        except errors.UnsupportedOperation:
118
121
            # On WT2, set_conflicts is unsupported, but the rmtree has the same
119
122
            # effect.