~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Andrew Bennetts
  • Date: 2007-02-28 07:08:25 UTC
  • mfrom: (2018.13.1 hpss)
  • mto: (2018.5.80 hpss)
  • mto: This revision was merged to the branch mainline in revision 2435.
  • Revision ID: andrew.bennetts@canonical.com-20070228070825-q2dvkjb0a11ouhtx
Update to current hpss branch?  Fix lots of test failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
562
562
                return result, urlutils.unescape(a_transport.relpath(url))
563
563
            except errors.NotBranchError, e:
564
564
                pass
565
 
            new_t = a_transport.clone('..')
 
565
            try:
 
566
                new_t = a_transport.clone('..')
 
567
            except errors.InvalidURLJoin:
 
568
                # reached the root, whatever that may be
 
569
                raise errors.NotBranchError(path=url)
566
570
            if new_t.base == a_transport.base:
567
571
                # reached the root, whatever that may be
568
572
                raise errors.NotBranchError(path=url)