/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 bzrlib/branch.py

  • Committer: Ian Clatworthy
  • Date: 2009-07-13 06:04:28 UTC
  • mfrom: (4527 +trunk)
  • mto: (4527.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4529.
  • Revision ID: ian.clatworthy@canonical.com-20090713060428-5m6apiywie6aqg6v
merge bzr.dev r4527

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,
39
38
        urlutils,
40
39
        )
41
40
from bzrlib.config import BranchConfig, TransportConfig
2909
2908
    @staticmethod
2910
2909
    def _get_branch_formats_to_test():
2911
2910
        """Return a tuple with the Branch formats to use when testing."""
2912
 
        raise NotImplementedError(self._get_branch_formats_to_test)
 
2911
        raise NotImplementedError(InterBranch._get_branch_formats_to_test)
2913
2912
 
2914
2913
    def pull(self, overwrite=False, stop_revision=None,
2915
2914
             possible_transports=None, local=False):
3070
3069
                _override_hook_source_branch=_override_hook_source_branch)
3071
3070
        finally:
3072
3071
            self.source.unlock()
3073
 
        return result
3074
3072
 
3075
3073
    def _push_with_bound_branches(self, overwrite, stop_revision,
3076
3074
            _override_hook_source_branch=None):