<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
</head>
<body>
<p>Many Years Ago™ Dylan created a ("temporary"!) repo to house an
experiment with trying to merge bugzilla.mozilla.org's fork of
Bugzilla (henceforth called BMO) back upstream. And thus,
<a class="moz-txt-link-freetext" href="https://github.com/bugzilla/harmony">https://github.com/bugzilla/harmony</a> was born. As this experiment
turned out to be largely successful (though much delayed) and is
now considered our primary development branch, it's time for it to
live in the actual Bugzilla repo
(<a class="moz-txt-link-freetext" href="https://github.com/bugzilla/bugzilla">https://github.com/bugzilla/bugzilla</a>) instead of off on its own.</p>
<p>Here's my plan:</p>
<ol>
<li>bugzilla/harmony:main will be force-pushed to
bugzilla/bugzilla:main (which does not exist yet)</li>
<li>bugzilla/bugzilla:master (which is currently the 5.3
development branch) will be renamed to
bugzilla/bugzilla:5.3-dev.</li>
<li>bugzilla/bugzilla:main and bugzilla/harmony:main will need to
get synced with each other frequently until the PRs in the
harmony repo are cleaned up.</li>
<li>bugzilla/harmony will live long enough for its existing PRs to
either land (and then be synced to bugzilla/bugzilla) or close
unmerged, and then it will be marked archived.</li>
</ol>
<p>There are some minor issues with that which I'd like to make
everyone aware of:</p>
<ol>
<li>The rename of bugzilla:master to bugzilla:5.3-dev will cause
people with existing bugzilla:master checkouts to get told the
branch no longer exists when they try to pull. But I think this
is important to do anyway to avoid master and main being
confused with each other.</li>
<li>GitHub's automatic links to Pull Requests in commit messages
will break. By default, GitHub puts the PR number in the summary
line of a commit when it gets merged. When you view the commit
log on GitHub, the PR number gets linked and you can click on it
to get to the PR. After the branch moves into the bugzilla repo,
these auto-generated links will link to PRs with the same number
in the bugzilla repo instead of the harmony repo, which will
obviously be wrong. Note that Harmony already has this problem
with PRs that originated on BMO before we forked (because the
numbers belong to mozilla-bteam/bmo PRs). This is probably
acceptable breakage. MOST of the PRs are linked from their
associated Bugzilla bug reports, and the bug number should
*also* be in the commit message. Going to the bug and following
the link back to the PR from there should still go to the right
place.</li>
</ol>
<p>I haven't set a date on this yet. I'd like to do it Soon™ but as
we actually have developers working on the Bugzilla 6 blockers
now, I'm thinking we stall until most of the blockers land
(because there are several in PRs already in the harmony repo) and
that will make less work keeping the two in sync until the PRs are
cleaned up.</p>
<p>Anyone have any thoughts on this?</p>
<div class="moz-signature">-- <br>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title></title>
</div>
<div class="moz-signature"
signature-switch-id="b0b24bd1-735c-4a02-9f5d-e2b2e9b4f40d">
<div>
<table style="width: 300px; border-style: none;"
cellpadding="3px" border="0px">
<tbody>
<tr>
<td style="width: 106px;"><img alt="[Bugzilla Logo]"
src="cid:part1.0pIUrs8N.BbKSRjfU@bugzilla.org"
width="100" height="100"></td>
<td>
<div><strong><span style="font-size: 13pt;">Dave Miller</span></strong></div>
<div>Project Leader</div>
<div><strong>Bugzilla Project</strong></div>
<div><a href="https://bugzilla.org/"
rel="nofollow
noopener noreferrer" target="_blank"
class="moz-txt-link-freetext">https://bugzilla.org/</a></div>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</body>
</html>