Canmove, confirm
725
edits
Changes
→Merging fx-sync to mozilla-central
== Merging fx-sync to mozilla-central ==
Often it's necessary 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 of course if you actually want to push this to mozilla-central (note that you almost certainly want a tracking bug for this.)
Steps to perform for the merge:
# 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.
# Check out a clean copy of fx-sync.
# Export the repository to something we can import into mozilla-central with
tools/convert.sh
This creates a new repository next to the existing checkout called fx-sync.converted
# Check out or update a copy of mozilla-central and do
hg pull -f .../fx-sync.converted
# Merge the newly created head with
hg merge
# Commit the merge with
hg commit
Don't forget to reference the tracking bug if you intend to push this to mozilla-central
