/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: Canonical.com Patch Queue Manager
  • Date: 2007-08-15 12:56:47 UTC
  • mfrom: (2665.5.5 bzr.ab2)
  • Revision ID: pqm@pqm.ubuntu.com-20070815125647-dx6if7e1osu5fnze
Switch commit and and merge to use has_same_location

Show diffs side-by-side

added added

removed removed

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