/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

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.
166
169
        tree.lock_read()
167
170
        self.addCleanup(tree.unlock)
168
171
        changes = list(tree.iter_changes(tree.basis_tree()))
169
 
        self.assertEqual(1, len(changes))
 
172
        self.assertEqual(1, len(changes), changes)
170
173
        self.assertEqual((None, 'a/b'), changes[0].path)
171
174
 
172
175
    def test_commit_sets_last_revision(self):