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

Add more Canon tags and lenses (backport #2881) #2885

Merged
merged 3 commits into from
Jan 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 8, 2024

This is an automatic backport of pull request #2881 done by Mergify.
Cherry-pick of 4b3ce1d has failed:

On branch mergify/bp/0.28.x/pr-2881
Your branch is up to date with 'origin/0.28.x'.

You are currently cherry-picking commit 4b3ce1d34.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 724b7f8 has failed:

On branch mergify/bp/0.28.x/pr-2881
Your branch is ahead of 'origin/0.28.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 724b7f85f.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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.com

@mergify mergify bot added the conflicts label Jan 8, 2024
@mergify mergify bot mentioned this pull request Jan 8, 2024
@ghost
Copy link

ghost commented Jan 8, 2024

👇 Click on the image for a new way to code review

Review these changes using an interactive CodeSee Map

Legend

CodeSee Map legend

(cherry picked from commit 4b3ce1d)

# Conflicts:
#	src/canonmn_int.cpp
@kmilos kmilos force-pushed the mergify/bp/0.28.x/pr-2881 branch from db25d52 to 8e0c808 Compare January 8, 2024 12:35
kmilos added 2 commits January 8, 2024 13:38
(cherry picked from commit 724b7f8)

# Conflicts:
#	src/canonmn_int.cpp
(cherry picked from commit 349c1f2)
@kmilos kmilos force-pushed the mergify/bp/0.28.x/pr-2881 branch from 8e0c808 to e20bba5 Compare January 8, 2024 12:38
@kmilos kmilos added lens Issue related to lens detection makerNote Anything related to one of the various supported MakerNote formats and removed conflicts labels Jan 8, 2024
@kmilos kmilos added this to the v0.28.2 milestone Jan 8, 2024
Copy link

codecov bot commented Jan 8, 2024

Codecov Report

Attention: 9 lines in your changes are missing coverage. Please review.

Comparison is base (72129e7) 63.99% compared to head (e20bba5) 63.99%.
Report is 16 commits behind head on 0.28.x.

Files Patch % Lines
src/rafimage.cpp 0.00% 6 Missing ⚠️
src/canonmn_int.cpp 83.33% 1 Missing and 1 partial ⚠️
src/datasets.cpp 66.66% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           0.28.x    #2885      +/-   ##
==========================================
- Coverage   63.99%   63.99%   -0.01%     
==========================================
  Files         103      103              
  Lines       22338    22352      +14     
  Branches    10821    10829       +8     
==========================================
+ Hits        14296    14304       +8     
- Misses       5818     5823       +5     
- Partials     2224     2225       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@kmilos kmilos merged commit 911edef into 0.28.x Jan 8, 2024
107 of 108 checks passed
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-2881 branch January 8, 2024 13:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lens Issue related to lens detection makerNote Anything related to one of the various supported MakerNote formats
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant