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

idiff acceptance fix #5482

Merged
merged 8 commits into from
Sep 14, 2023
Merged

idiff acceptance fix #5482

merged 8 commits into from
Sep 14, 2023

Conversation

ESadek-MO
Copy link
Contributor

@ESadek-MO ESadek-MO commented Sep 7, 2023

🚀 Pull Request

Closes #5098.

Description

idiff was failing when "accept" was chosen (often with the user unaware), as there was a conditional that checked for file name duplication. Since the idea is to replace the new file, I've removed this conditional entirely.

Draft because I have yet to test this works/doesn't break anything, and needs a whats new.

@codecov
Copy link

codecov bot commented Sep 7, 2023

Codecov Report

Patch and project coverage have no change.

Comparison is base (c526ce0) 89.37% compared to head (290f3fd) 89.37%.
Report is 4 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5482   +/-   ##
=======================================
  Coverage   89.37%   89.37%           
=======================================
  Files          89       89           
  Lines       22444    22446    +2     
  Branches     5381     5387    +6     
=======================================
+ Hits        20059    20061    +2     
  Misses       1639     1639           
  Partials      746      746           

see 2 files with indirect coverage changes

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

@ESadek-MO ESadek-MO marked this pull request as ready for review September 14, 2023 12:37
@bjlittle bjlittle self-requested a review September 14, 2023 12:48
Copy link
Member

@bjlittle bjlittle left a comment

Choose a reason for hiding this comment

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

@ESadek-MO LGTM 👍

@bjlittle bjlittle merged commit 064e6ee into SciTools:main Sep 14, 2023
15 checks passed
@ESadek-MO ESadek-MO deleted the idiff_fix branch November 23, 2023 15:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Image test idiff.py acceptance not working as intended
2 participants