Confirmed users
3,990
edits
ReleaseEngineering/SpecialRepositories: Difference between revisions
Jump to navigation
Jump to search
ReleaseEngineering/SpecialRepositories (view source)
Revision as of 14:50, 24 September 2014
, 24 September 2014→Ash
m (→Ash: Correct repo URL after ash-mozharness move) |
(→Ash) |
||
| Line 42: | Line 42: | ||
You should see a line on that job's summary saying which revision of ash-mozharness was used: | You should see a line on that job's summary saying which revision of ash-mozharness was used: | ||
TinderboxPrint: ash-mozharness_revlink: https://hg.mozilla.org/build/ash-mozharness/rev/1e6478311b3f | TinderboxPrint: ash-mozharness_revlink: https://hg.mozilla.org/build/ash-mozharness/rev/1e6478311b3f | ||
== Checking-in and backing out == | |||
If you want to test something out on the gecko tree rather than the ash-mozharness tree you should back out afterward. | |||
It makes it easier to merge m-c into Ash without conflicts. | |||
== Merging m-c to ash == | |||
The same process as with Cedar: | |||
<pre> | |||
# Get a copy of ash | |||
hg clone http://hg.mozilla.org/projects/ash | |||
cd ash | |||
# Update to latest, in case someone has updated cedar since you last cloned/updated. | |||
# the hg up -C will blow away any local changes! | |||
hg pull | |||
hg up -C -r default | |||
# Pull latest m-c changes in | |||
hg pull http://hg.mozilla.org/mozilla-central | |||
hg merge | |||
hg commit -m "Merge m-c -> ash" | |||
# Push to cedar | |||
hg push ssh://hg.mozilla.org/projects/ash | |||
</pre> | |||
= Cedar = | = Cedar = | ||