Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 26, 2025

closes #2238

  • The syntax: the tag name has to be enclosed in colons.
  • The placeholder will be replaced by translated value, not by the plain value.
  • Characters in tag's translated value, which are not allowed in file names, will be replaced by underscore.

This is an automatic backport of pull request #2791 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Aug 26, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Aug 26, 2025

Cherry-pick of d31fff2 has failed:

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

You are currently cherry-picking commit d31fff24.
  (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:   exiv2.md

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

Cherry-pick of eea87bf has failed:

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

You are currently cherry-picking commit eea87bf6.
  (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:   app/actions.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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@kmilos kmilos added this to the v0.28.6 milestone Aug 26, 2025
optimise regex and remove duplicate call of ImageFactory
optimise regex and remove duplicate call of ImageFactory
tests adjusted for msys and cygwin;
regex contains "Exif" for better filtering;
documentation adjusted
for concatenation of new file name, concatenation operator of std::filesystem::path is not used:
On MSYS2 UCRT64 the path separator to be used in terminal is slash, but as concatenation operator a back slash will be added. Rename works but with verbose a path with different operators will be shown.
@kmilos
Copy link
Collaborator

kmilos commented Aug 27, 2025

@norbertwg Any ideas why this is not working (test fails) on the 0.28.x branch?

AssertionError: 'File[87 chars]runner/work/exiv2/exiv2/test/tmp/02_Sep_2018:basesuffix:.exv\n' != 'File[87 chars]runner/work/exiv2/exiv2/test/tmp/02_Sep_2018.PANO.exv\n'
  File 1/1: /home/runner/work/exiv2/exiv2/test/tmp/_DSC8437.PANO.exv
- Renaming file to /home/runner/work/exiv2/exiv2/test/tmp/02_Sep_2018:basesuffix:.exv
?                                                                    ^^^^^^^^^^^^
+ Renaming file to /home/runner/work/exiv2/exiv2/test/tmp/02_Sep_2018.PANO.exv
?                                                                    ^^^^^
 : Standard output does not match

@kmilos kmilos mentioned this pull request Aug 27, 2025
@kmilos
Copy link
Collaborator

kmilos commented Aug 27, 2025

NVM, think I found the missing backport piece...

@kevinbackhouse Please feel free to squash the last commits.

@kmilos kmilos mentioned this pull request Aug 27, 2025
@kmilos kmilos merged commit 32c85ef into 0.28.x Aug 28, 2025
59 checks passed
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-2791 branch August 28, 2025 12:48
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.

3 participants