← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Martin Pool
  • Date: 2009-06-19 09:06:56 UTC
  • mfrom: (4463 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4464.
  • Revision ID: mbp@sourcefrog.net-20090619090656-d5weqeecyscv8kqp
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
35
35
        symbol_versioning,
36
36
        transport,
37
37
        tsort,
 
38
        ui,
38
39
        urlutils,
39
40
        )
40
41
from bzrlib.config import BranchConfig, TransportConfig
104
105
    def _activate_fallback_location(self, url):
105
106
        """Activate the branch/repository from url as a fallback repository."""
106
107
        repo = self._get_fallback_repository(url)
107
 
        if repo.has_same_location(self.repository):
108
 
            raise errors.UnstackableLocationError(self.base, url)
109
108
        self.repository.add_fallback_repository(repo)
110
109
 
111
110
    def break_lock(self):
2908
2907
    @staticmethod
2909
2908
    def _get_branch_formats_to_test():
2910
2909
        """Return a tuple with the Branch formats to use when testing."""
2911
 
        raise NotImplementedError(InterBranch._get_branch_formats_to_test)
 
2910
        raise NotImplementedError(self._get_branch_formats_to_test)
2912
2911
 
2913
2912
    def pull(self, overwrite=False, stop_revision=None,
2914
2913
             possible_transports=None, local=False):
3069
3068
                _override_hook_source_branch=_override_hook_source_branch)
3070
3069
        finally:
3071
3070
            self.source.unlock()
 
3071
        return result
3072
3072
 
3073
3073
    def _push_with_bound_branches(self, overwrite, stop_revision,
3074
3074
            _override_hook_source_branch=None):