← 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: John Arbash Meinel
  • Date: 2008-07-30 02:19:16 UTC
  • mto: (3697.7.4 1.7)
  • mto: This revision was merged to the branch mainline in revision 3748.
  • Revision ID: john@arbash-meinel.com-20080730021916-65dpdenvz27emgnk
Handle when there are more than 2 LCAs while searching for the unique lca.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
1176
1176
        self.assertEqual(['C-id', 'B-id'], [t.get_revision_id()
1177
1177
                                            for t in merger._lca_trees])
1178
1178
 
 
1179
    def test_find_base_triple_criss_cross(self):
 
1180
        #       A-.
 
1181
        #      / \ \
 
1182
        #     B   C F # F is merged into both branches
 
1183
        #     |\ /| |
 
1184
        #     | X | |\
 
1185
        #     |/ \| | :
 
1186
        #   : D   E |  
 
1187
        #    \|   |/ 
 
1188
        #     G   H
 
1189
        builder = self.setup_criss_cross_graph()
 
1190
        builder.build_snapshot('F-id', ['A-id'], [])
 
1191
        builder.build_snapshot('H-id', ['E-id', 'F-id'], [])
 
1192
        builder.build_snapshot('G-id', ['D-id', 'F-id'], [])
 
1193
        merger = self.make_Merger(builder, 'H-id')
 
1194
        self.assertEqual(['B-id', 'C-id', 'F-id'],
 
1195
                         [t.get_revision_id() for t in merger._lca_trees])
 
1196
 
1179
1197
    def test_no_criss_cross_passed_to_merge_type(self):
1180
1198
        class LCATreesMerger(LoggingMerger):
1181
1199
            supports_lca_trees = True