CBL-7401: Port Version Vector Conflict Detection Tests from Sync Gate… #2364
+641
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Code Coverage Results:
|
snej
approved these changes
Oct 14, 2025
| } | ||
|
|
||
| // HLVConflictStatus returns whether two HLVs are in conflict or not | ||
| enum HLVConflictStatus : int16_t { |
There was a problem hiding this comment.
Is this necessary? Seems like the same as the versionOrder enum in sourceID.hh
There was a problem hiding this comment.
That's from SGW.
torcolvin
approved these changes
Oct 14, 2025
| }, | ||
| { | ||
| "existing mv", | ||
| #if 0 |
There was a problem hiding this comment.
I think it's fine to just note in this PR that the merge function changed the values, the #if 0 is a bit confusing
There was a problem hiding this comment.
I tried emphasize the difference. The purpose of this PR is to find the differences and assess them. Right?
jianminzhao
added a commit
that referenced
this pull request
Oct 16, 2025
CBL-7499: Invalid binary version ID when saving a resolved conflict doc that has legacy RevID CBL-7500: Pull lower remote legacy rev but with same generation was not resulted in conflict CBL-7401: Port Version Vector Conflict Detection Tests from Sync Gateway Tests (#2364) CBL-7402: Port Version Vector Local Wins /Remote Wins Conflict Resolution Tests from Sync Gateway Tests CBL-7403: Port Version Vector Merge Conflict Resolution Tests from Sync Gateway Tests CBL-7551: Rev message contains two ;; in the history for the client-win merge rev (#2366) CBL-7547: Client-win resolved doc as rev-tree encoded version cannot be pushed back (#2365)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…way Tests
CBL-7402: Port Version Vector Local Wins /Remote Wins Conflict Resolution Tests from Sync Gateway Tests
CBL-7403: Port Version Vector Merge Conflict Resolution Tests from Sync Gateway Tests