Permalink
Browse files

fix for issue #37 - replicating conflicting revisions

  • Loading branch information...
1 parent a18c573 commit 8acf63cc72e3ccd0600d2f8327c9fed860ce7a57 fcandalija committed Feb 7, 2012
Showing with 4 additions and 1 deletion.
  1. +4 −1 Source/TDPusher.m
View
@@ -75,9 +75,12 @@ - (void) beginReplicating {
if (_createTarget)
return;
+ // Include conflicts so all conflicting revisions are replicated too
+ TDChangesOptions options = kDefaultTDChangesOptions;
+ options.includeConflicts = YES;
// Process existing changes since the last push:
TDRevisionList* changes = [_db changesSinceSequence: [_lastSequence longLongValue]
- options: nil filter: _filter];
+ options:&options filter: _filter];
if (changes.count > 0)
[self processInbox: changes];

0 comments on commit 8acf63c

Please sign in to comment.