← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-05 15:31:34 UTC
  • mto: (4343.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4344.
  • Revision ID: v.ladeuil+lp@free.fr-20090505153134-q4bp4is9gywsmzrv
Clean up test for log formats.

* bzrlib/tests/blackbox/test_logformats.py:
Update tests to actual style.

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):