← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-09 20:23:07 UTC
  • mfrom: (4265.1.4 bbc-merge)
  • Revision ID: pqm@pqm.ubuntu.com-20090409202307-n0depb16qepoe21o
(jam) Change _fetch_uses_deltas = False for CHK repos until we can
        write a better fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
243
243
 
244
244
        if self.other_rev_id is None:
245
245
            other_basis_tree = self.revision_tree(self.other_basis)
246
 
            if other_basis_tree.has_changes(self.other_tree):
 
246
            changes = other_basis_tree.changes_from(self.other_tree)
 
247
            if changes.has_changed():
247
248
                raise WorkingTreeNotRevision(self.this_tree)
248
249
            other_rev_id = self.other_basis
249
250
            self.other_tree = other_basis_tree
275
276
            basis_tree = self.revision_tree(self.this_tree.last_revision())
276
277
        except errors.NoSuchRevision:
277
278
            basis_tree = self.this_tree.basis_tree()
278
 
        if not self.this_tree.has_changes(basis_tree):
 
279
        changes = self.this_tree.changes_from(basis_tree)
 
280
        if not changes.has_changed():
279
281
            self.this_rev_id = self.this_basis
280
282
 
281
283
    def set_interesting_files(self, file_list):
460
462
                               **kwargs)
461
463
 
462
464
    def _do_merge_to(self, merge):
463
 
        if self.other_branch is not None:
464
 
            self.other_branch.update_references(self.this_branch)
465
465
        merge.do_merge()
466
466
        if self.recurse == 'down':
467
467
            for relpath, file_id in self.this_tree.iter_references():