/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/commit.py

  • Committer: Aaron Bentley
  • Date: 2007-08-03 01:46:21 UTC
  • mto: This revision was merged to the branch mainline in revision 2703.
  • Revision ID: aaron.bentley@utoronto.ca-20070803014621-igt3i5fwv3rigvd0
Switch commit and merge to Repository.has_same_location

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
685
685
        # it fails; a better way of approaching this is to 
686
686
        # finally implement the explicit-caches approach design
687
687
        # a while back - RBC 20070306.
688
 
        if (sub_tree.branch.repository.bzrdir.root_transport.base
689
 
            ==
690
 
            self.work_tree.branch.repository.bzrdir.root_transport.base):
 
688
        if sub_tree.branch.repository.has_same_location(
 
689
            self.work_tree.branch.repository):
691
690
            sub_tree.branch.repository = \
692
691
                self.work_tree.branch.repository
693
692
        try: