Confirmed users
396
edits
Sheriffing/How To/Unified Repos: Difference between revisions
Jump to navigation
Jump to search
m
no edit summary
(Drop references to fx-team) |
mNo edit summary |
||
| Line 222: | Line 222: | ||
mergetointegration = !$HG pull central ; $HG pull $1 ; $HG up $1 ; $HG merge central ; $HG commit -m "Merge m-c to $1, a=merge $2" ; $HG push -r . $1 | mergetointegration = !$HG pull central ; $HG pull $1 ; $HG up $1 ; $HG merge central ; $HG commit -m "Merge m-c to $1, a=merge $2" ; $HG push -r . $1 | ||
With these set up, I can merge | With these set up, I can merge autoland's revision 04a3d9130aa0 over to mozilla-central with the following command: | ||
hg mergetocentral | hg mergetocentral autoland 04a3d9130aa0 | ||
and then I can merge mozilla-central's tip back to | and then I can merge mozilla-central's tip back to autoland with the following command: | ||
hg mergetointegration | hg mergetointegration autoland | ||
This cuts down on a lot of repetitive typing, saving a bit of time. | This cuts down on a lot of repetitive typing, saving a bit of time. | ||