← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-07-17 08:29:40 UTC
  • mfrom: (3549.1.4 stacking)
  • Revision ID: pqm@pqm.ubuntu.com-20080717082940-zdwz5cqhdoot1swx
(mbp) stacking post-merge review tweaks

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1059
1059
            if stacked:
1060
1060
                stacked_branch_url = self.root_transport.base
1061
1061
            else:
1062
 
                try:
1063
 
                    stacked_branch_url = source_branch.get_stacked_on_url()
1064
 
                except (errors.NotStacked, errors.UnstackableBranchFormat,
1065
 
                    errors.UnstackableRepositoryFormat):
1066
 
                    stacked_branch_url = None
 
1062
                # if a stacked branch wasn't requested, we don't create one
 
1063
                # even if the origin was stacked
 
1064
                stacked_branch_url = None
1067
1065
        except errors.NotBranchError:
1068
1066
            source_branch = None
1069
1067
            try: