~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: John Arbash Meinel
  • Date: 2005-07-11 19:41:17 UTC
  • mto: (1185.11.1)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: john@arbash-meinel.com-20050711194117-a8404a42ccd55979
Updated functions (add,branch) to use find_branch instead of Branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
582
582
        import errno
583
583
        from bzrlib.merge import merge
584
584
        from bzrlib.branch import DivergedBranches, NoSuchRevision, \
585
 
             find_cached_branch, Branch
 
585
             find_cached_branch, find_branch
586
586
        from shutil import rmtree
587
587
        from meta_store import CachedStore
588
588
        import tempfile
615
615
                                          to_location)
616
616
                else:
617
617
                    raise
618
 
            br_to = Branch(to_location, init=True)
 
618
            br_to = find_branch(to_location, init=True)
619
619
 
620
620
            revno = br_to.lookup_revision(revision[0])
621
621
            try: