Codecov Report

Merging #31050 into stable10 will increase coverage by 0.07%.
The diff coverage is 64.5%.

@@              Coverage Diff               @@
##             stable10   #31050      +/-   ##
==============================================
+ Coverage       62.26%   62.34%   +0.07%     
- Complexity      18330    18550     +220     
==============================================
  Files            1205     1210       +5     
  Lines           72219    72607     +388     
  Branches         1274     1272       -2     
==============================================
+ Hits            44970    45266     +296     
- Misses          26871    26962      +91     
- Partials          378      379       +1

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 785b426...94c18a3. Read the comment docs.

a wild conflict appears...

Added a commit to remove duplicate code that got left behind in tests/integration and another copy of dav-versions.feature - the "real" apiMain/dav-versions.feature has all the deleted scenarios already.

I think something is still wrong with:

 >> apiMain suite has undefined steps. Please choose the context to generate snippets:

  [0] None
  [1] FeatureContext
  [2] CardDavContext
  [3] CalDavContext
  [4] AppManagementContext
 > 0

--- Use --snippets-for CLI option to generate snippets for following apiMain suite steps:

    And we save it into "FILEID"

That And we save it into is a Behat built-in thing in BehatVariablesContext. I guess we lost that along the way somewhere recently.

Added commit FeatureContext extends \rdx\behatvars\BehatVariablesContext
Something went wrong in conflict resolution in 1 of the other 50 commits, this critical line got missed.
I think it will pass - we will see.

Travis has some stupid travis-ci/push thing that does not work - whatever that is about???
At least drone is passing now.

Good that this is finally merged. In future we should try very hard not to have big changes like this that wait a long time until someone decides they should be backported, and other dependent changes pile up behind and...
"semver" should help because we would make a new/fresh release branch (e.g. 10.1) for such a thing, and not attempt to backport it.

@DeepDiver1975 re: commits - I know all about rebasing and squashing "fix" commits into the original commits where they belong. For those last 2 commits, it was late at night here and I wanted to just prove the fixes. Then I intended to try and find the commits (among the other 49) where the conflict resolution had gone wrong in the past and apply the fixes to those commits. That is a bit tedious (looking at the content of each commit in the history to find ones that went wrong), so I left it for after sleep. In the meantime the PR has been merged. So it is too late now - those last 2 commits are on the stable10 branch.

two regressions:

• OC_Image doesn't always set imageType correctly #18645
• [10.0.9]Trying to get owner from an erased file #32346