← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-01-27 20:24:43 UTC
  • mfrom: (3960.2.1 1.12-progress-warnings)
  • Revision ID: pqm@pqm.ubuntu.com-20090127202443-ty2bu1hh91dumasz
(jam) Avoid getting a UserWarning by not creating an unused progress
        bar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
2153
2153
        wt.merge_from_branch(wt.branch, 'C-id')
2154
2154
        wt.commit('D merges B & C', rev_id='D-id')
2155
2155
        conflicts = wt.merge_from_branch(wt.branch, to_revision='F-id')
2156
 
        self.assertEqual(0, conflicts)
 
2156
        self.expectFailure("Merge3Merger doesn't use lcas for symlink content",
 
2157
            self.assertEqual, 0, conflicts)
2157
2158
        self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2158
2159
 
2159
2160
    def test_renamed_symlink(self):
2420
2421
        # TODO: We need to use the per-file graph to properly select a BASE
2421
2422
        #       before this will work. Or at least use the LCA trees to find
2422
2423
        #       the appropriate content base. (which is B, not A).
2423
 
        self.assertEqual('base content\n', wt.get_file_text('foo-id'))
 
2424
        self.expectFailure("Merge3Merger doesn't recognize reverted content",
 
2425
            self.assertEqual, 'base content\n', wt.get_file_text('foo-id'))
2424
2426
 
2425
2427
    def test_other_modified_content(self):
2426
2428
        builder = self.get_builder()
2436
2438
            [('modify', ('foo-id', 'F content\n'))]) # Override B content
2437
2439
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
2438
2440
        wt, conflicts = self.do_merge(builder, 'F-id')
 
2441
        self.expectFailure("Merge3Merger only uses BASE for content",
 
2442
            self.assertEqual, 'F content\n', wt.get_file_text('foo-id'))
2439
2443
        self.assertEqual(0, conflicts)
2440
2444
        self.assertEqual('F content\n', wt.get_file_text('foo-id'))
2441
2445