Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Comment out bogus code in XMPUtils.cpp (backport #1902) #1923

Merged
merged 6 commits into from
Sep 29, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 24, 2021

This is an automatic backport of pull request #1902 done by Mergify.
Cherry-pick of bb9ff53 has failed:

On branch mergify/bp/0.27-maintenance/pr-1902
Your branch is ahead of 'origin/0.27-maintenance' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit bb9ff53e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   tests/bugfixes/github/test_issue_1901.py
	modified:   xmpsdk/src/XMPUtils.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/convert.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot added the conflicts label Sep 24, 2021
@kevinbackhouse kevinbackhouse added this to the v0.27.5 milestone Sep 24, 2021
@kevinbackhouse kevinbackhouse added bug OSS-Fuzz Bug reported by https://google.github.io/oss-fuzz/ labels Sep 24, 2021
@kevinbackhouse kevinbackhouse force-pushed the mergify/bp/0.27-maintenance/pr-1902 branch from f75381b to a221330 Compare September 24, 2021 10:20
@kevinbackhouse kevinbackhouse marked this pull request as draft September 24, 2021 10:20
@kevinbackhouse kevinbackhouse force-pushed the mergify/bp/0.27-maintenance/pr-1902 branch 2 times, most recently from bb9ff53 to e2f3c6b Compare September 24, 2021 10:34
@kevinbackhouse kevinbackhouse marked this pull request as ready for review September 24, 2021 10:37
@kevinbackhouse
Copy link
Collaborator

The diff in src/convert.cpp looks complicated, but that's because I moved a catch block, which affected the indentation. I recommend viewing the diff with whitespace changes hidden.
Screenshot from 2021-09-24 11-36-27

@codecov
Copy link

codecov bot commented Sep 24, 2021

Codecov Report

Merging #1923 (0425eac) into 0.27-maintenance (b669a9d) will increase coverage by 0.01%.
The diff coverage is 50.00%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##           0.27-maintenance    #1923      +/-   ##
====================================================
+ Coverage             46.30%   46.32%   +0.01%     
====================================================
  Files                   146      146              
  Lines                 22948    22948              
  Branches              11781    11781              
====================================================
+ Hits                  10626    10630       +4     
+ Misses                 6707     6702       -5     
- Partials               5615     5616       +1     
Impacted Files Coverage Δ
src/convert.cpp 27.79% <50.00%> (+0.33%) ⬆️
src/value.cpp 60.62% <0.00%> (+0.29%) ⬆️

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 b669a9d...0425eac. Read the comment docs.

Copy link
Collaborator

@clanmills clanmills left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kevinbackhouse As always, thank you for working on this.

@kevinbackhouse kevinbackhouse merged commit 676d959 into 0.27-maintenance Sep 29, 2021
@mergify mergify bot deleted the mergify/bp/0.27-maintenance/pr-1902 branch September 29, 2021 21:36
@clanmills clanmills mentioned this pull request Sep 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug OSS-Fuzz Bug reported by https://google.github.io/oss-fuzz/
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants