Confirmed users
396
edits
Sheriffing/How To/Unified Repos: Difference between revisions
Added some useful hg aliases.
(Added some useful hg aliases.) |
|||
| Line 200: | Line 200: | ||
* hg merge -r ca142ec8ba0f -P | * hg merge -r ca142ec8ba0f -P | ||
This will print out everything on b2g-inbound (up to and including revision ca142ec8ba0f) that is not already on mozilla-central. | This will print out everything on b2g-inbound (up to and including revision ca142ec8ba0f) that is not already on mozilla-central. | ||
= Extras = | |||
I set up the following aliases in my global .hgrc file to make merging things around trunk a little faster: | |||
[alias] | |||
# merge tree $1, revision $2 to central, optionally appending $3 (for "CLOSED TREE", etc) | |||
mergetocentral = !$HG pull central ; $HG up central ; $HG pull $1 ; $HG merge $2 ; $HG commit -m "Merge $1 to central, a=merge $3" ; $HG push -r . central | |||
# merge central tip to tree $1, optionally appending $2 (for "CLOSED TREE", etc) | |||
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 fx-team's revision 04a3d9130aa0 over to mozilla-central with the following command: | |||
hg mergetocentral fx-team 04a3d9130aa0 | |||
and then I can merge mozilla-central's tip back to fx-team with the following command: | |||
hg mergetointegration fx-team | |||
This cuts down on a lot of repetitive typing, saving a bit of time. | |||