couchbase-lite-core
couchbase-lite-core copied to clipboard
couchbase
CBL-5947: Merge Beryllium into master
The merge is not as bad as I thought it would be. A few conflicts needed resolving, but no manual adjustment needed to take place. I've run the VectorSearch tests locally and they are passing.
Code Coverage Results:
| Type | Percentage |
|---|---|
| branches | 67.15 |
| functions | 79.0 |
| instantiations | 35.1 |
| lines | 78.66 |
| regions | 74.49 |
Blackduck failure is a strange one - seems to have trouble with some mysterious non-ascii character in the git log output. I ran the same git log command locally and used grep, and then manual looking, and could not find this mysterious character, so I think we can ignore it.
Reverted "Give CMake build -Werror" because it causes many errors in linux build. As its not a simple 4-line change, going to create a separate ticket for that.
@jianminzhao If you could give this a review now, the only failure is a strange error from the blackduck manifest check which seems to have a problem with some non-ASCII character in the git log output (which I couldn't find)
@jianminzhao If you could give this a review now, the only failure is a strange error from the blackduck manifest check which seems to have a problem with some non-ASCII character in the
git logoutput (which I couldn't find)
Change ascii to utf-8 and it should probably be fine
Now the big question: Which parts of this were conflicts that need to be reviewed and which parts applied cleanly?
Now the big question: Which parts of this were conflicts that need to be reviewed and which parts applied cleanly?
@borrrden Well, there were roughly 12 files with conflicts IIRC, each with about 3 conflicts on average. Almost all of those conflicts were ones where I just needed to pick between the two, because they're different versions of the same thing. So this meant mostly choosing the version from 3.2.
If we think it needs it, I could go through the conflicts again in a meeting?
Excellent, so no conflicts that were too complicated? That sounds good enough to me