exiv2_v0.27.5RC3

[clanmills]

No description provided.

[kevinbackhouse]

I must have missed one of the conan invocations.

[codecov]

Codecov Report

Merging #1938 (3edca8c) into 0.27-maintenance (c9c7f69) will not change coverage.
The diff coverage is n/a.

@@                Coverage Diff                @@
##           0.27-maintenance    #1938   +/-   ##
=================================================
  Coverage             46.32%   46.32%           
=================================================
  Files                   146      146           
  Lines                 22950    22950           
  Branches              11781    11781           
=================================================
  Hits                  10632    10632           
  Misses                 6702     6702           
  Partials               5616     5616           

---

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 c9c7f69...3edca8c. Read the comment docs.

[clanmills]

Bollocks. git refuses my fix: 0.27-maintenance -> 0.27-maintenance (refusing to allow an OAuth App to create or update workflow .github/workflows/on_PR_windows_matrix.yml without workflow scope)

I think the change is here in .github/workflows/on_PR_windows_matrix.yml

      - name: Run Conan
        run: |
          md build
          cd build
          conan config install https://github.com/conan-io/conanclientcert.git
          conan profile list
          conan install .. --build missing
          dir ..
          tree /f ../conanCache

[kevinbackhouse]

Hang on. I was looking at this from my phone before, but I am at my desk now. I'll see if I can fix it.

[kevinbackhouse]

It looks like it wasn't running with the latest version of the CI, so I have tried rebasing the commits onto the latest 0.27-maintenance.

[clanmills]

Thanks @kevinbackhouse For me, git is mostly a mystery. I know about 6 commands and that's it.

[kevinbackhouse]

@clanmills: that's me with cmake! It seems like a bunch of magic incantations that I have very little interest in learning.

[clanmills]

Luis's the cmake man. He actually likes it! I confess to liking Windows.

[clanmills]

Well done, @kevinbackhouse. Now I have to figure out how to remove two dead commits from my branch. Probably easier to pull down a fresh copy from GitHub. I believe that's the fix for about 90% of git troubles.

[kevinbackhouse]

Do you mean you want to squash this into a single commit? I think you might be able to do that from the dropdown on the "merge" button.

[kevinbackhouse]

@clanmills: I just had another look at this. Do you just want to get rid of the two "build trigger" commits? I can do that if you like. Or you can do it like this:

git checkout exiv2_v0.27.5RC3
git reset --hard exiv2_v0.27.5RC3~2
git push --force

[clanmills]

I got rid of the build triggers using the SmartGit GUI. That was straightforward. I deleted the local branch and pulled a mint copy from GitHub. Rather scared of a command such as git push --force which might push the house down!

Less nervous about git reset --hard exiv2_v0.27.5RC3~2 which only hits the local repos.

[kevinbackhouse]

@clanmills: The easiest solution is to push another commit to edit the files to how you want them, then use the "squash and merge" option:

[clanmills]

I heard Dan talking about squashing. I thought squash was something to drink on a hot summer's day! Ah, yes. That makes sense. More questions:

1. How did you get your code from Add workaround for conan outage. #1939 into the base of this branch?
2. The difference between git pull and git pull --rebase and what's fast forward and what's merge?

I'm going to merge this PR, tag 0.27-maintenance and publish the RC3 on GitHub. You've done a great job on v0.27.5. This is "Kev's Release".

[kevinbackhouse]

The answer to 1 is that I did a rebase. I.e. I took your 3 commits and reapplied them to the latest version of 0.27-maintenance. The sequence of commands was something like this:

git checkout exiv2_v0.27.5RC3
git rebase origin/0.27-maintenance
git push --force

To be honest, I have never heard of git pull --rebase. I'll have to go and look that up.

I often use the gitk tool to view the commit graph and check that the correct thing happened when I do something potentially destructive like a rebase.

[clanmills]

Ah!! Right. Now I know what rebase is. Thanks for the explanation.