canmove, Confirmed users
725
edits
Services/Sync/Getting Started: Difference between revisions
Jump to navigation
Jump to search
Services/Sync/Getting Started (view source)
Revision as of 07:32, 26 November 2010
, 26 November 2010→Merging fx-sync to mozilla-central
| Line 51: | Line 51: | ||
== Merging fx-sync to mozilla-central == | == Merging fx-sync to mozilla-central == | ||
Often it's | Often it's convenient to merge fx-sync to mozilla-central yourself so you can develop on an up-to-date version of Sync within mozilla-central (and of course if you actually want to push new Sync changes to mozilla-central. Just note that you almost certainly want a tracking bug for this.) | ||
Steps to perform for the merge: | 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 | |||
This creates a new repository next to the existing checkout called fx-sync.converted | <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> | |||
Don't forget to reference the tracking bug if you intend to push this to mozilla-central | </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> | |||