/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-09 18:10:01 UTC
  • mto: (7490.133.15 transform)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200809181001-bt9wdmmquzij3e5l
Split out bzr-specific Conflicts code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_commit.py
113
113
        osutils.rmtree('B/a')
114
114
        try:
115
115
            # bzr resolve --all
116
 
            tree_b.set_conflicts(conflicts.ConflictList())
 
116
            tree_b.set_conflicts([])
117
117
        except errors.UnsupportedOperation:
118
118
            # On WT2, set_conflicts is unsupported, but the rmtree has the same
119
119
            # effect.