← Back to branch summary

~thisfred/u1db/json_vs_content

« back to all changes in this revision

Viewing changes to u1db/backends/__init__.py

  • Committer: Eric Casteleijn
  • Date: 2012-05-22 20:38:49 UTC
  • Revision ID: eric.casteleijn@canonical.com-20120522203849-309k403ksvvaflbd
added same_content_as and is_deleted, fixed erroneous use of .content

Show diffs side-by-side

added added

removed removed

Lines of Context:
u1db/backends/__init__.py
110
110
            # so we should send it back, and we should not generate a
111
111
            # conflict
112
112
            state = 'superseded'
113
 
        elif cur_doc.content == doc.content:
 
113
        elif cur_doc.same_content_as(doc):
114
114
            # the documents have been edited to the same thing at both ends
115
115
            doc_vcr.maximize(cur_vcr)
116
116
            doc_vcr.increment(self._replica_uid)