Canmove, confirm
725
edits
Changes
→Merging fx-sync to mozilla-central
<pre>hg commit</pre>
Don't forget to reference the tracking bug if you intend to push this to mozilla-central</li>
</ol>
If you want to update such a repository with new revisions from mozilla-central, you can of course just merge them in. But if you want to keep a straight history timeline (e.g. because you want to push later), you can do this:
<ol>
<li>Remove the merge revision (assuming that's the current tip, so qpop all applied mq patches first):
<pre>hg strip tip</pre></li>
<li>Pull updates from mozilla-central:
<pre>hg pull -u</pre></li>
<li>Merge fx-sync revisions back in (<rev> is the tip revision of the fx-sync.converted repository):
<pre>hg merge <rev>
hg commit</pre>
</li>
</ol>
