← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-19 14:17:55 UTC
  • mfrom: (6437.3.11 2.5)
  • mto: (6437.3.14 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20120119141755-g0kmmvr2dcbb5r0v
Merge lp:bzr/2.5, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1394
1394
                    from_location, revision)
1395
1395
                raise errors.BzrCommandError(msg)
1396
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