← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2005-08-25 12:57:59 UTC
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050825125759-5ea06cbf79464ef9
unbreak revert. gotta remember to check then commit

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
273
273
                                       "base")
274
274
            base_is_ancestor = True
275
275
        else:
276
 
            if base_revision[1] == -1:
 
276
            if base_revision[1] == "auto":
 
277
                base_revno, base_rev_id = this_branch.common_ancestor(other_branch)
 
278
                base_branch, base_tree = get_tree((base_revision[0], "revid:%s" % base_rev_id), tempdir, "base")
 
279
            elif base_revision[1] == -1:
277
280
                base_branch, base_tree = get_tree(base_revision, tempdir, "base")
278
281
                base_rev_id = base_branch.last_patch()
279
282
            elif base_revision[1] is None:
280
 
                base_revno, base_rev_id = this_branch.common_ancestor(other_branch)
281
 
                base_branch, base_tree = get_tree((base_revision[0], "revid:%s" % base_rev_id), tempdir, "base")
 
283
                base_branch, base_tree = get_tree(base_revision, tempdir, "base")
 
284
                base_rev_id = None
282
285
            else:
283
286
                base_branch, base_tree = get_tree(base_revision, tempdir, "base")
284
287
                base_rev_id = base_branch.lookup_revision(base_revision[1])