← 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: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

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
227
227
 
228
228
    def test_nested_merge(self):
229
229
        tree = self.make_branch_and_tree('tree',
230
 
            format='development-subtree')
 
230
            format='dirstate-with-subtree')
231
231
        sub_tree = self.make_branch_and_tree('tree/sub-tree',
232
 
            format='development-subtree')
 
232
            format='dirstate-with-subtree')
233
233
        sub_tree.set_root_id('sub-tree-root')
234
234
        self.build_tree_contents([('tree/sub-tree/file', 'text1')])
235
235
        sub_tree.add('file')
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())
2634
2634
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2635
2635
        # 'tree-reference'
2636
2636
        wt = self.make_branch_and_tree('tree',
2637
 
            format='development-subtree')
 
2637
            format='dirstate-with-subtree')
2638
2638
        wt.lock_write()
2639
2639
        self.addCleanup(wt.unlock)
2640
2640
        sub_tree = self.make_branch_and_tree('tree/sub-tree',
2641
 
            format='development-subtree')
 
2641
            format='dirstate-with-subtree')
2642
2642
        wt.set_root_id('a-root-id')
2643
2643
        sub_tree.set_root_id('sub-tree-root')
2644
2644
        self.build_tree_contents([('tree/sub-tree/file', 'text1')])
2669
2669
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2670
2670
        # 'tree-reference'
2671
2671
        wt = self.make_branch_and_tree('tree',
2672
 
            format='development-subtree')
 
2672
            format='dirstate-with-subtree')
2673
2673
        wt.lock_write()
2674
2674
        self.addCleanup(wt.unlock)
2675
2675
        sub_tree = self.make_branch_and_tree('tree/sub',
2676
 
            format='development-subtree')
 
2676
            format='dirstate-with-subtree')
2677
2677
        wt.set_root_id('a-root-id')
2678
2678
        sub_tree.set_root_id('sub-tree-root')
2679
2679
        self.build_tree_contents([('tree/sub/file', 'text1')])
2708
2708
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2709
2709
        # 'tree-reference'
2710
2710
        wt = self.make_branch_and_tree('tree',
2711
 
            format='development-subtree')
 
2711
            format='dirstate-with-subtree')
2712
2712
        wt.lock_write()
2713
2713
        self.addCleanup(wt.unlock)
2714
2714
        sub_tree = self.make_branch_and_tree('tree/sub',
2715
 
            format='development-subtree')
 
2715
            format='dirstate-with-subtree')
2716
2716
        wt.set_root_id('a-root-id')
2717
2717
        sub_tree.set_root_id('sub-tree-root')
2718
2718
        self.build_tree_contents([('tree/sub/file', 'text1')])
2751
2751
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2752
2752
        # 'tree-reference'
2753
2753
        wt = self.make_branch_and_tree('tree',
2754
 
            format='development-subtree')
 
2754
            format='dirstate-with-subtree')
2755
2755
        wt.lock_write()
2756
2756
        self.addCleanup(wt.unlock)
2757
2757
        sub_tree = self.make_branch_and_tree('tree/sub',
2758
 
            format='development-subtree')
 
2758
            format='dirstate-with-subtree')
2759
2759
        wt.set_root_id('a-root-id')
2760
2760
        sub_tree.set_root_id('sub-tree-root')
2761
2761
        self.build_tree_contents([('tree/sub/file', 'text1')])