← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

(andrew) Fix bug when pushing stackable branch in unstackable repo to
        default-stacking target.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
3062
3062
                stack_on = self._get_full_stack_on()
3063
3063
        try:
3064
3064
            branch.set_stacked_on_url(stack_on)
3065
 
        except errors.UnstackableBranchFormat:
 
3065
        except (errors.UnstackableBranchFormat,
 
3066
                errors.UnstackableRepositoryFormat):
3066
3067
            if self._require_stacking:
3067
3068
                raise
3068
3069