/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/blackbox/test_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_merge.py
148
148
                             '=======\n'
149
149
                             'D\n'
150
150
                             '>>>>>>> MERGE-SOURCE\n',
151
 
                             tree.get_file_text(tree.id2path('f-id')))
 
151
                             tree.get_file_text('fname'))
152
152
 
153
153
    def test_merge_explicit_reprocess_show_base(self):
154
154
        tree, other = self.create_conflicting_branches()
170
170
                             'B\n'
171
171
                             'D\n'
172
172
                             '>>>>>>> MERGE-SOURCE\n',
173
 
                             tree.get_file_text(tree.id2path('f-id')))
 
173
                             tree.get_file_text('fname'))
174
174
 
175
175
    def test_merge_override_show_base(self):
176
176
        tree, other = self.create_conflicting_branches()
188
188
                             'B\n'
189
189
                             'D\n'
190
190
                             '>>>>>>> MERGE-SOURCE\n',
191
 
                             tree.get_file_text(tree.id2path('f-id')))
 
191
                             tree.get_file_text('fname'))
192
192
 
193
193
    def test_merge_with_missing_file(self):
194
194
        """Merge handles missing file conflicts"""