/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-06-22 00:52:45 UTC
  • mfrom: (6973.7.4 python3-f)
  • Revision ID: jelmer@jelmer.uk-20180622005245-0q92vv00fy9ouyqv
Merge lp:~jelmer/brz/python3-f

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_merge.py
141
141
        # 'show-base' is not set
142
142
        self.run_bzr('merge ../other', working_dir='tree',
143
143
                     retcode=1)
144
 
        self.assertEqualDiff('a\n'
145
 
                             'B\n'
146
 
                             '<<<<<<< TREE\n'
147
 
                             'C\n'
148
 
                             '=======\n'
149
 
                             'D\n'
150
 
                             '>>>>>>> MERGE-SOURCE\n',
 
144
        self.assertEqualDiff(b'a\n'
 
145
                             b'B\n'
 
146
                             b'<<<<<<< TREE\n'
 
147
                             b'C\n'
 
148
                             b'=======\n'
 
149
                             b'D\n'
 
150
                             b'>>>>>>> MERGE-SOURCE\n',
151
151
                             tree.get_file_text('fname'))
152
152
 
153
153
    def test_merge_explicit_reprocess_show_base(self):
162
162
        # Explicitly disable reprocess
163
163
        self.run_bzr('merge ../other --no-reprocess', working_dir='tree',
164
164
                     retcode=1)
165
 
        self.assertEqualDiff('a\n'
166
 
                             '<<<<<<< TREE\n'
167
 
                             'B\n'
168
 
                             'C\n'
169
 
                             '=======\n'
170
 
                             'B\n'
171
 
                             'D\n'
172
 
                             '>>>>>>> MERGE-SOURCE\n',
 
165
        self.assertEqualDiff(b'a\n'
 
166
                             b'<<<<<<< TREE\n'
 
167
                             b'B\n'
 
168
                             b'C\n'
 
169
                             b'=======\n'
 
170
                             b'B\n'
 
171
                             b'D\n'
 
172
                             b'>>>>>>> MERGE-SOURCE\n',
173
173
                             tree.get_file_text('fname'))
174
174
 
175
175
    def test_merge_override_show_base(self):
177
177
        # Setting '--show-base' will auto-disable '--reprocess'
178
178
        self.run_bzr('merge ../other --show-base', working_dir='tree',
179
179
                     retcode=1)
180
 
        self.assertEqualDiff('a\n'
181
 
                             '<<<<<<< TREE\n'
182
 
                             'B\n'
183
 
                             'C\n'
184
 
                             '||||||| BASE-REVISION\n'
185
 
                             'b\n'
186
 
                             'c\n'
187
 
                             '=======\n'
188
 
                             'B\n'
189
 
                             'D\n'
190
 
                             '>>>>>>> MERGE-SOURCE\n',
 
180
        self.assertEqualDiff(b'a\n'
 
181
                             b'<<<<<<< TREE\n'
 
182
                             b'B\n'
 
183
                             b'C\n'
 
184
                             b'||||||| BASE-REVISION\n'
 
185
                             b'b\n'
 
186
                             b'c\n'
 
187
                             b'=======\n'
 
188
                             b'B\n'
 
189
                             b'D\n'
 
190
                             b'>>>>>>> MERGE-SOURCE\n',
191
191
                             tree.get_file_text('fname'))
192
192
 
193
193
    def test_merge_with_missing_file(self):