[mythtv] Call for testing branch devel/ffmpeg-resync (ffmpeg-cleanup)

[Peter Bennett]

On 7/6/22 06:22, John Pilkington wrote:
> On 06/07/2022 10:40, John Pilkington wrote:
>> On 04/07/2022 02:38, Scott Theisen wrote:
>>> I have rebased onto the master branch my ffmpeg-cleanup 
>>> https://github.com/MythTV/mythtv/pull/416 pull request and Peter 
>>> Bennett has pulled it into the devel/ffmpeg-resync branch for ease 
>>> of testing.
>>>
>>> Peter and I have tested it, but we would appreciate more testing 
>>> before merging it into master.
>>>
>>> Thanks,
>>>
>>> Scott Theisen
>>
>> I'm having problems getting this.  I thought I had built from that 
>> branch soon after this Call, but what I got was 33Pre117.g25b7583221.
>>
>> Now the latest commit appearing at 
>> https://github.com/MythTV/mythtv/commits/devel/ffmpeg-resync is 
>> bd41df47c69 from July 1, and starting another build gives
>>
>> john at HPFed rpm]$ ionice -c3 
>> ~/packaging/MythTV/rpm/BUILD_MYTHTV_RPMS_from_repoA -r 
>> fedora-35-x86_64-rpmfusion_free devel/ffmpeg-resync
>> Cloning into 'mythtv'...
>> done.
>> Updating files: 100% (18296/18296), done.
>> branch 'devel/ffmpeg-resync' set up to track 
>> 'origin/devel/ffmpeg-resync'.
>> Switched to a new branch 'devel/ffmpeg-resync'
>> ----
>> Building mythtv version 33.Pre.117.g25b7583221 at commit 
>> 25b7583221bc49f66d4b82774a2ce99c4aadf5e1
>> ----
>> ^C
>>
>> Suggestions?   Thanks,
>>
>> John P
>>
>>
>
> It looks as if
>
> cd <path/to>repoA
> git checkout devel/ffmpeg-resync
> git pull --rebase
>
> may have fixed it.  Now building 33.Pre.574.gbd41df47
>
>
The correct version currently for devel/ffmpeg-resync is 
v33-Pre-574-gbd41df47c6 so you are now correct.

The problem may have arisen because the devel/ffmpeg-resync branch has 
been rebased several times.

This is one approach.

git checkout devel/ffmpeg-resync
git fetch origin
git reset --hard origin/devel/ffmpeg-resync

If you are a developer that would lose any local changes you had committed.

Peter