Sheriffing/How To/Backouts: Difference between revisions

Sheriffing/How To/Backouts (view source)

329 bytes removed , 14 June 2017

no edit summary

Confirmed users

2,317

edits

@@ Line 1: / Line 1: @@
 When a patch is landed that causes build or test failures, it must be backed out to restore the tree to a passing state again. This page documents the procedure for performing backouts both for Gecko changes and Gaia.
+= New recommended way of backouts =
+* With unified repos backouts are now more easily - please follow [[Sheriffing/How:To:SheriffingFromUnifiedRepos|Unified Repos Backup]]
 = Gecko Backouts =
@@ Line 33: / Line 38: @@
 * If the commit message needs to be modifying after qfinish (i.e. forgotten CLOSED TREE), hg commit --amend will open the backout in an editor for modification.
-= Gaia Backouts =
-If the changeset is not part of a merge (i.e. pushed directly instead instead of a merged Pull Request):
- git revert 12345ab
-If the changeset is a merged Pull Request:
- git revert -m 1 12345ab
-Use |git push| once finished. Git also supports |pull --rebase| and |commit --amend| with the same usage as given above for Mercurial.
-For reverting multiple git commits at the same time, see [http://stackoverflow.com/questions/1463340/revert-multiple-git-commits this StackOverflow] post.
 = Best Practices and Communication =