Confirmed users
396
edits
Sheriffing/How To/Backouts: Difference between revisions
→when the commit message was wrong like forgot closed tree etc
(Created page with "Backouts Sheriffs also have to do Backouts of checkins from the various Mozilla Trees to fix bustages, test failures etc. This document should help doing these backouts = Re...") |
|||
| Line 23: | Line 23: | ||
hg qimport -r tip && hg qrefresh -e && hg qfinish -a && hg push | hg qimport -r tip && hg qrefresh -e && hg qfinish -a && hg push | ||
qimport can also be useful if someone has pushed to the tree between you hg qfinish -a'ing and you pushing: | |||
hg qimport -r tip && hg qpop && hg pull -u && hg qpush [nnnnnn].diff && hg qfinish -a && hg push | |||
This pulls the tip commit back into your mercurial queue, pops it off the queue, pulls in the other person's changes, pushes your commit back onto the queue on top of the new changes, finishes the queue and pushes to the tree. | |||