/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 bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-12-04 03:52:13 UTC
  • mfrom: (1551.19.15 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20071204035213-2kot5u403spjchen
Merge warns when criss-cross encountered + docs

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
314
314
        if NULL_REVISION in revisions:
315
315
            self.base_rev_id = NULL_REVISION
316
316
        else:
317
 
            self.base_rev_id = graph.find_unique_lca(*revisions)
 
317
            self.base_rev_id, steps = graph.find_unique_lca(revisions[0],
 
318
                revisions[1], count_steps=True)
318
319
            if self.base_rev_id == NULL_REVISION:
319
320
                raise UnrelatedBranches()
 
321
            if steps > 1:
 
322
                warning('Warning: criss-cross merge encountered.  See bzr'
 
323
                        ' help criss-cross.')
320
324
        self.base_tree = self.revision_tree(self.base_rev_id)
321
325
        self.base_is_ancestor = True
322
326
        self.base_is_other_ancestor = True