← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Lalo Martins
  • Date: 2005-09-09 18:59:17 UTC
  • mto: (1185.1.22)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: lalo@exoweb.net-20050913094215-c9b1ceb71213cf51
polishing up the RevisionSpec api, as per suggestions from Robert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1338
1338
    if revision is None:
1339
1339
        revno = branch_from.revno()
1340
1340
    else:
1341
 
        revno, rev_id = RevisionSpec(branch_from, revision)
 
1341
        revno, rev_id = RevisionSpec(revision).in_history(branch_from)
1342
1342
    br_to.update_revisions(branch_from, stop_revision=revno)
1343
1343
    merge((to_location, -1), (to_location, 0), this_dir=to_location,
1344
1344
          check_clean=False, ignore_zero=True)