← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2007-08-20 13:07:12 UTC
  • mfrom: (2732 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2733.
  • Revision ID: abentley@panoramicfeedback.com-20070820130712-buopmg528zcgwyxc
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
304
304
                                                  self.this_branch)
305
305
 
306
306
    def _maybe_fetch(self, source, target, revision_id):
307
 
        if (source.repository.bzrdir.root_transport.base !=
308
 
            target.repository.bzrdir.root_transport.base):
 
307
        if not source.repository.has_same_location(target.repository):
309
308
            target.fetch(source, revision_id)
310
309
 
311
310
    def find_base(self):