/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/controldir.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-21 14:18:24 UTC
  • mfrom: (6729.6.2 move-errors-urlutils)
  • Revision ID: jelmer@jelmer.uk-20170721141824-z0s7jhoijaxw5bim
Merge lp:~jelmer/brz/move-errors-urlutils.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/controldir.py
760
760
                pass
761
761
            try:
762
762
                new_t = a_transport.clone('..')
763
 
            except errors.InvalidURLJoin:
 
763
            except urlutils.InvalidURLJoin:
764
764
                # reached the root, whatever that may be
765
765
                raise errors.NotBranchError(path=url)
766
766
            if new_t.base == a_transport.base: