== Merging fx-sync to mozilla-central ==
Often it's necessary convenient to do merge fx-sync to mozilla-central yourself so you can develop on an up-to-date version of Sync within mozilla-central before it actually lands. And (and of course if you actually want to push this new Sync changes to mozilla-central (. Just note that you almost certainly want a tracking bug for this.)
Steps to perform for the merge:
# <ol><li> You need a patched version of Mercurial, so get a checkout of Mercurial's source, apply [http://mercurial.selenic.com/bts/file1099/keep-rename.patch Mardak's keep-rename patch], and build Mercurial.</li># <li> Check out a clean copy of fx-sync.</li># <li> Export the repository to something we can import into mozilla-central with <pre>tools/convert.sh</pre>This creates a new repository next to the existing checkout called fx-sync.converted</li># <li> Check out or update a copy of mozilla-central and do <pre>hg pull -f .../fx-sync.converted</pre></li># <li> Merge the newly created head with <pre>hg merge</pre></li># <li> Commit the merge with <pre>hg commit</pre>Don't forget to reference the tracking bug if you intend to push this to mozilla-central</li></ol>
