/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 breezy/tests/per_branch/test_branch.py

  • Committer: Jelmer Vernooij
  • Date: 2018-02-04 00:06:29 UTC
  • mfrom: (6851.1.1 more-foreign)
  • Revision ID: jelmer@jelmer.uk-20180204000629-9h8r8kf2s2cw7wb9
Merge lp:~jelmer/brz/more-foreign-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_branch.py
644
644
        try:
645
645
            this_branch._format.set_reference(this_branch.controldir, None,
646
646
                other_branch)
647
 
        except NotImplementedError:
 
647
        except (NotImplementedError, errors.IncompatibleFormat):
648
648
            # that's ok
649
649
            pass
650
650
        else: