← 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: Patch Queue Manager
  • Date: 2012-07-28 20:20:38 UTC
  • mfrom: (6524.5.8 context_in_diffs)
  • Revision ID: pqm@pqm.ubuntu.com-20120728202038-cl923dptn267ve1x
(gz) Add option to specify how much context bzr should use in diffs (Paul
 Nixon)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
1
 
# Copyright (C) 2005-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2005-2012 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
520
520
        merger.merge_type = _mod_merge.Merge3Merger
521
521
        conflict_count = merger.do_merge()
522
522
        self.assertEqual(0, conflict_count)
523
 
        self.assertEqual(set([old_root_id]), tree.all_file_ids())
 
523
        self.assertEquals(set([old_root_id]), tree.all_file_ids())
524
524
        tree.set_parent_ids([])
525
525
 
526
526
    def test_merge_add_into_deleted_root(self):
559
559
class TestPlanMerge(TestCaseWithMemoryTransport):
560
560
 
561
561
    def setUp(self):
562
 
        super(TestPlanMerge, self).setUp()
 
562
        TestCaseWithMemoryTransport.setUp(self)
563
563
        mapper = versionedfile.PrefixMapper()
564
564
        factory = knit.make_file_factory(True, mapper)
565
565
        self.vf = factory(self.get_transport())