← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Erik Bågfors
  • Date: 2006-01-03 09:23:51 UTC
  • mto: (1185.50.72 bzr-jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: erik@bagfors.nu-20060103092351-ca586a459c94e253
expanded tabs

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
415
415
        br_from = Branch.open(location)
416
416
        br_to = tree_to.branch
417
417
 
418
 
        if revision is None:
419
 
            rev_id = None
 
418
        if revision is None:
 
419
            rev_id = None
420
420
        elif len(revision) == 1:
421
 
            rev_id = revision[0]._match_on(br_from,br_from.revision_history()).rev_id
422
 
        else:
423
 
            raise BzrCommandError('bzr pull --revision takes one value.')
 
421
            rev_id = revision[0]._match_on(br_from,br_from.revision_history()).rev_id
 
422
        else:
 
423
            raise BzrCommandError('bzr pull --revision takes one value.')
424
424
 
425
425
        old_rh = br_to.revision_history()
426
426
        count = tree_to.pull(br_from, overwrite, rev_id)