Confirmed users
571
edits
Sheriffing/How To/Merges: Difference between revisions
m
→Merging back from mozilla-central to autoland and mozilla-inbound: remove a=merge for merges back
m (→Merging from autoland and mozilla-inbound to mozilla-central: retrigger -> reun) |
m (→Merging back from mozilla-central to autoland and mozilla-inbound: remove a=merge for merges back) |
||
| Line 60: | Line 60: | ||
# Update autoland: <code>hg update autoland</code> | # Update autoland: <code>hg update autoland</code> | ||
# Merge from central to autoland: <code>hg merge central</code> | # Merge from central to autoland: <code>hg merge central</code> | ||
# Add a commit message: <code>hg commit -m "Merge mozilla-central to autoland. | # Add a commit message: <code>hg commit -m "Merge mozilla-central to autoland. CLOSED TREE"</code> | ||
# Transfer the files to Autoland: <code>hg push -r . autoland</code> | # Transfer the files to Autoland: <code>hg push -r . autoland</code> | ||
# Update inbound: <code>hg update inbound</code> | # Update inbound: <code>hg update inbound</code> | ||
# Merge from central to inbound: <code>hg merge central</code> | # Merge from central to inbound: <code>hg merge central</code> | ||
# Add a commit messagel: <code>hg commit -m "Merge mozilla-central to mozilla-inbound. | # Add a commit messagel: <code>hg commit -m "Merge mozilla-central to mozilla-inbound. CLOSED TREE"</code> | ||
# Transfer the files to inbound: <code>hg push -r . inbound</code> | # Transfer the files to inbound: <code>hg push -r . inbound</code> | ||