← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/vf_repository.py

  • Committer: John Arbash Meinel
  • Date: 2011-08-30 10:54:28 UTC
  • mfrom: (5609.48.9 2.3)
  • mto: (6015.28.2 2.4)
  • mto: This revision was merged to the branch mainline in revision 6124.
  • Revision ID: john@arbash-meinel.com-20110830105428-3xu4hkvizhfj5k11
Merge 2.3 into 2.4, and fix up the conflict for resolving bug #835035

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/vf_repository.py
918
918
        """
919
919
        if not self._format.supports_external_lookups:
920
920
            raise errors.UnstackableRepositoryFormat(self._format, self.base)
 
921
        # This can raise an exception, so should be done before we lock the
 
922
        # fallback repository.
 
923
        self._check_fallback_repository(repository)
921
924
        if self.is_locked():
922
925
            # This repository will call fallback.unlock() when we transition to
923
926
            # the unlocked state, so we make sure to increment the lock count
924
927
            repository.lock_read()
925
 
        self._check_fallback_repository(repository)
926
928
        self._fallback_repositories.append(repository)
927
929
        self.texts.add_fallback_versioned_files(repository.texts)
928
930
        self.inventories.add_fallback_versioned_files(repository.inventories)