CBL-7554: Use the actual winner and loser revision id when calling c4doc_resolveConflict (#3468)

* Remove space - unrelated

* Set winner and losing rev correctly

Author: velicuvlad

Objective-C/CBLCollection.mm

@@ -753,6 +753,9 @@ - (BOOL) saveResolvedDocument: (CBLDocument*)resolvedDoc
                         error: (NSError**)outError
 {
     CBL_LOCK(_mutex) {
+        CBLStringBytes winningRevID;
+        CBLStringBytes losingRevID;
+        
         CBLDatabase* db = self.database;
         if (![self database: db isValid: outError])
             return NO;
@@ -769,19 +772,21 @@ - (BOOL) saveResolvedDocument: (CBLDocument*)resolvedDoc
                 resolvedDoc = remoteDoc;
         }
 
-        if (resolvedDoc != localDoc)
+        if (resolvedDoc == localDoc) {
+            winningRevID = localDoc.revisionID;
+            losingRevID = remoteDoc.revisionID;
+        } else {
             resolvedDoc.collection = self;
-        
-        // The remote branch has to win, so that the doc revision history matches the server's.
-        CBLStringBytes winningRevID = remoteDoc.revisionID;
-        CBLStringBytes losingRevID = localDoc.revisionID;
+            winningRevID = remoteDoc.revisionID;
+            losingRevID = localDoc.revisionID;
+        }
 
         // mergedRevFlags:
         C4RevisionFlags mergedFlags = 0;
 
         // mergedBody:
         alloc_slice mergedBody;
-        if (resolvedDoc != remoteDoc) {
+        if (resolvedDoc != localDoc && resolvedDoc != remoteDoc) {
             if (resolvedDoc) {
                 // Unless the remote revision is being used as-is, we need a new revision:
                 NSError* err = nil;

Swift/Authenticator.swift

@@ -55,7 +55,6 @@ public struct BasicAuthenticator: IAuthenticator {
     }
 
     // MARK: Internal
-    
     func toImpl() -> CBLAuthenticator {
         return CBLBasicAuthenticator(username: username, password: password)
     }