← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Andrew Bennetts
  • Date: 2009-07-20 06:58:15 UTC
  • mfrom: (4551 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4552.
  • Revision ID: andrew.bennetts@canonical.com-20090720065815-mgzvjj90jsz2lzo5
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3788
3788
            base_branch, base_path = Branch.open_containing(base_loc,
3789
3789
                possible_transports)
3790
3790
        # Find the revision ids
3791
 
        if revision is None or len(revision) < 1 or revision[-1] is None:
 
3791
        other_revision_id = None
 
3792
        base_revision_id = None
 
3793
        if revision is not None:
 
3794
            if len(revision) >= 1:
 
3795
                other_revision_id = revision[-1].as_revision_id(other_branch)
 
3796
            if len(revision) == 2:
 
3797
                base_revision_id = revision[0].as_revision_id(base_branch)
 
3798
        if other_revision_id is None:
3792
3799
            other_revision_id = _mod_revision.ensure_null(
3793
3800
                other_branch.last_revision())
3794
 
        else:
3795
 
            other_revision_id = revision[-1].as_revision_id(other_branch)
3796
 
        if (revision is not None and len(revision) == 2
3797
 
            and revision[0] is not None):
3798
 
            base_revision_id = revision[0].as_revision_id(base_branch)
3799
 
        else:
3800
 
            base_revision_id = None
3801
3801
        # Remember where we merge from
3802
3802
        if ((remember or tree.branch.get_submit_branch() is None) and
3803
3803
             user_location is not None):