<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<div class="moz-cite-prefix">On 2/9/22 14:42, Peter Bennett wrote:<br>
</div>
<blockquote type="cite"
cite="mid:346820eb-5da5-7bb6-4bc6-77369dc27efa@gmail.com">
<p>The pull request for ffmpeg cleanup has 73 commits. I will
start going through them starting at the first and
cherry-picking them into MythTV master. I will exclude any
changes to the ffmpeg directory, as those will be made in the
MythTV/FFmpeg repository. If any of the changes to MythTV are
dependent on corresponding FFmpeg changes I will leave them
until later.<br>
</p>
</blockquote>
<br>
The reason I have the FFmpeg changes there as well, is to enable
bisecting them if necessary with MythTV.<br>
<br>
<blockquote type="cite"
cite="mid:346820eb-5da5-7bb6-4bc6-77369dc27efa@gmail.com">
<p> </p>
<p>The MythTV/FFmpeg repository changes will need to be made
against MythTV/FFmpeg/master, not against 4.4 or 5.0, so that
subsequent changes from FFmpeg/FFmpeg/master can be incorporated
over them into MythTV/FFmpeg/master. I plan to cherry-pick the
FFmpeg/FFmpeg/master changes into MythTV/FFmpeg/master so that
there is a linear history that can be bisected if necessary.<br>
</p>
</blockquote>
<br>
My understanding of the git workflow with a fork is that you <b>don't</b>
want to work on the master branch. Instead you work on a different
branch (e.g. mythtv-on-master) so you can trivially git pull master.<br>
<br>
<blockquote type="cite"
cite="mid:346820eb-5da5-7bb6-4bc6-77369dc27efa@gmail.com">
<p> </p>
<p>I prefer not to squash commits, so that they can be bisected
and bad commits can be reverted.</p>
</blockquote>
<br>
My idea was since I have already rebased MythTV's customizations and
have now reverted a number of them, it doesn't make sense to keep
that history in the mythtv/FFmpeg repository. (It would still be in
the mythtv/mythtv repository.)<br>
<br>
It seems we each want equivalent branches with different histories:<br>
<ul>
<li>mythtv-master: includes the reversion commits, which are then
buried under upstream FFmpeg commits, for ease of bisection.</li>
<li>mythtv-on-master: mythtv customizations rebased on top of
FFmpeg master periodically, so we can see what the
customizations are and to enable upstreaming.</li>
</ul>
<br>
Re-targeting <a class="moz-txt-link-freetext" href="https://github.com/MythTV/FFmpeg/pull/1">https://github.com/MythTV/FFmpeg/pull/1</a> onto
MythTV/FFmpeg/master doesn't look too difficult.<br>
<br>
-Scott<br>
</body>
</html>