← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisionspec.py

  • Committer: Andrew Bennetts
  • Date: 2008-03-17 17:16:11 UTC
  • mfrom: (3290 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20080317171611-o9wdrnf0m7qwo198
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisionspec.py
642
642
        branch.lock_read()
643
643
        other_branch.lock_read()
644
644
        try:
645
 
            revision_source = revision.MultipleRevisionSources(
646
 
                    branch.repository, other_branch.repository)
647
645
            graph = branch.repository.get_graph(other_branch.repository)
648
646
            revision_a = revision.ensure_null(revision_a)
649
647
            revision_b = revision.ensure_null(revision_b)