← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-02-21 23:12:39 UTC
  • mfrom: (1563.1.3 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060221231239-643b2cbe5aefc06a
Fixup internally generated deprecation warning from merge_inner and unbreak bzr push to new sftp branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
506
506
                        if new_transport.base == transport.base:
507
507
                            raise BzrCommandError("Could not creeate "
508
508
                                                  "path prefix.")
509
 
            if isinstance(transport, LocalTransport):
510
 
                br_to = WorkingTree.create_standalone(location).branch
511
 
            else:
512
 
                br_to = Branch.create(location)
 
509
            br_to = bzrlib.bzrdir.BzrDir.create_branch_convenience(location)
513
510
        old_rh = br_to.revision_history()
514
511
        try:
515
512
            try: