~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/builtins.py

Committer: Patch Queue Manager
Date: 2012-01-19 13:42:40 UTC
mfrom: (6379.13.2 fix-branch-into-empty-bzrdir)
mto: (6436.2.3 sibling-branches) (6238.2.26 urllib-verifies-ssl-certs) (6437.20.1 bzr-pypy) (6443.1.1 bzr.dev) (6352.4.2 get-seeks-backwards) (6445.1.1 trunk) (6159.2.5 bzr) (6450.1.1 bzr.dev) (6457.1.1 trunk) (6461.1.1 trunk) (6468.1.1 merge-2.5) (6093.4.72 translations) (6472.1.1 merge-2.5) (6474.1.1 trunk) (6476.1.1 dev_2.5_integration) (6492.1.1 trunk) (6498.1.1 trunk) (6507.1.1 trunk) (6524.1.1 bzr.dev) (6531.1.1 merge-2.5) (6548.1.1 trunk) (6549.3.1 dev_2.5_integration) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6444.
Revision ID: pqm@pqm.ubuntu.com-20120119134240-g8me32sn0s86c6r1

(jelmer) Fetch revisions when branching into an empty control directory.
(Jelmer Vernooij)

added added

removed removed

1394

from_location, revision)

1395

raise errors.BzrCommandError(msg)

1396

else:

1397

try:

1398

to_repo = to_dir.open_repository()

1399

except errors.NoRepositoryPresent:

1400

to_repo = to_dir.create_repository()

1401

to_repo.fetch(br_from.repository, revision_id=revision_id)

1397

1402

branch = br_from.sprout(to_dir, revision_id=revision_id)

1398

1403

_merge_tags_if_possible(br_from, branch)

1399

1404

# If the source branch is stacked, the new branch may