[mythtv] Problem with commit 9506b88 2017/10/09 : Cleanup gcc and clang warnings generated by -Wextra switch.

Stuart Auchterlonie stuarta at squashedfrog.net
Thu Oct 26 14:45:55 UTC 2017

On 25/10/17 19:23, Peter Bennett wrote:
> On 10/25/2017 02:10 PM, Jonatan Lindblad wrote:
>> They certainly are in the repository, the merge pulled them all in.
>> $ git show 9506b88
>> commit 9506b88b3bc2c3717b32102ece45794fa71f791b
>> Merge: 594b16057b 6ee77bc064
>> Author: David Hampton <snip>
>> $ git merge-base 594b16057b 6ee77bc064
>> 693bc46ce5e665e04ac2dad9975d45a45be196e0
>> $ git log --oneline 693bc46ce5e665e04ac2dad9975d45a45be196e0..6ee77bc064
>> 6ee77bc064 Use local variable to prevent warning messages.
>> 45c22fd783 Conditionally compile out unfinished code.
>> 334dc5fe84 Fix 'address of array will always evaluate to true' warning.
>> ffaa099751 Fix "using directive refers to implicitly-defined namespace
>> 'std'" warning.
>> 0dbe67eacf Fix 'comparison of integers of different signs' warning
>> message.
>> db88d597d5 Fix 'max of value and unsigned zero' warning message.
>> 869832702c Fix 'implicit conversion changes value' warning message.
>> 8e5fcd3de8 Conditionally compile out the unused RequestRange function.
>> 1e4b5fb394 Move an unused InfoMap printing function to a different file.
>> ...
>> Cheers
>> Jonatan
> Hi Jonatan
> I guess I did not explain it properly. They are in our repository but if
> I check out any of them I get a copy of MythTV that does not include my
> fixes from a commit that I made a month and a half before those were
> merged. It seems like I see source code as it existed on David's
> repository, which was rather behind ours, and it fails to compile on
> Raspberry Pi as it is missing those changes I made a month and a half
> before.
> Peter

I had this problem before. It's because they were committed
chronologically before your patches, so when you checkout that
specific commit, you are rolling back in time.

So you effectively have to use diff you get from `git show <hash>`
and do a reverse patch with it to remove it

Slightly confusing when you don't realize what it's doing behind
the scenes.

That's my theory anyway, dunno if it's true :)


More information about the mythtv-dev mailing list