/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Andrew Bennetts
  • Date: 2009-03-12 07:42:57 UTC
  • mto: This revision was merged to the branch mainline in revision 4129.
  • Revision ID: andrew.bennetts@canonical.com-20090312074257-vx7qxv8dy654g9kp
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