<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<p><br>
</p>
<br>
<div class="moz-cite-prefix">On 04/30/2018 11:52 AM, Brian J.
Murrell wrote:<br>
</div>
<blockquote type="cite"
cite="mid:1525103557.14374.18.camel@interlinx.bc.ca">
<blockquote type="cite" style="color: #000000;">
<pre wrap="">I believe that using subtree or subrepo requires that we use the
master
branch of FFmpeg.
</pre>
</blockquote>
<pre wrap="">I'm not convinced of that. At least with subrepo, you can choose which
branch you clone and track into the subdir. If/when you want to change
the upstream tracking branch, worst case scenario (assuming the tool
doesn't have a way to change) is you do as above. Create your patch
vs. upstream, blow the subdir away, recreate the subdir using
{subtree|submodule} and then apply your patch, fixing any conflicts,
etc.
</pre>
</blockquote>
This is essentially what we do at the moment. We delete the source
code, copy in the new source, and then work at re-applying all of
our changes. I am trying to improve on that process, which is rather
time-consuming.<br>
<br>
Peter<br>
</body>
</html>