← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Robert Collins
  • Date: 2009-04-15 04:45:06 UTC
  • mto: This revision was merged to the branch mainline in revision 4292.
  • Revision ID: robertc@robertcollins.net-20090415044506-30fnvsa3ukai60xb
Fix up lock correctness to deal with adding fallback repositories to locked branch objects.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1961
1961
        except (errors.NotStacked, errors.UnstackableBranchFormat,
1962
1962
            errors.UnstackableRepositoryFormat), e:
1963
1963
            return
1964
 
        self._activate_fallback_location(fallback_url)
 
1964
        self._activate_fallback_location(fallback_url, None)
1965
1965
 
1966
1966
    def _get_config(self):
1967
1967
        return RemoteBranchConfig(self)