Index: man/man1/git-drover.1 |
diff --git a/man/man1/git-drover.1 b/man/man1/git-drover.1 |
index 8fdac437f4a688a9450a3c2a850047eda45df641..b9532c65f3f10ef32ebde42c3e81bd2fbb67fd51 100644 |
--- a/man/man1/git-drover.1 |
+++ b/man/man1/git-drover.1 |
@@ -2,12 +2,12 @@ |
.\" Title: git-drover |
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> |
-.\" Date: 08/25/2014 |
+.\" Date: 09/05/2014 |
.\" Manual: Chromium depot_tools Manual |
-.\" Source: depot_tools f0a4926 |
+.\" Source: depot_tools 2171f9c |
.\" Language: English |
.\" |
-.TH "GIT\-DROVER" "1" "08/25/2014" "depot_tools f0a4926" "Chromium depot_tools Manual" |
+.TH "GIT\-DROVER" "1" "09/05/2014" "depot_tools 2171f9c" "Chromium depot_tools Manual" |
.\" ----------------------------------------------------------------- |
.\" * Define some portability stuff |
.\" ----------------------------------------------------------------- |
@@ -39,8 +39,19 @@ git-drover \- Apply a commit from the trunk to a release branch, or from one rel |
.sp |
git drover is NOT IMPLEMENTED yet\&. See the EXAMPLE section for the equivalent sequence of commands to run\&. |
.SH "EXAMPLE" |
+.SS "PREREQUISITES" |
.sp |
-Before working with branches, you must \*(Aqgclient sync \-\-with_branch_heads\*(Aq at least once to fetch the branches\&. |
+Before working with branches, you must \fIgclient sync \-\-with_branch_heads\fR at least once to fetch the branches\&. |
+.sp |
+.it 1 an-trap |
+.nr an-no-space-flag 1 |
+.nr an-break-flag 1 |
+.br |
+.ps +1 |
+\fBMerge Example\fR |
+.RS 4 |
+.sp |
+ |
.sp |
.if n \{\ |
.RS 4 |
@@ -51,7 +62,7 @@ Before working with branches, you must \*(Aqgclient sync \-\-with_branch_heads\* |
# Here\*(Aqs the commit we want to \*(Aqdrover\*(Aq\&. |
\fB$ git log \-n 1 \-\-pretty=fuller\fR |
-commit fd935aae549962611c2f178dc9026f23ae2ad9bd |
+commit 14293306d7969cff815969e2502f47794a63fbc5 |
Author: some\&.committer <some\&.committer@chromium\&.org> |
AuthorDate: Thu Apr 10 08:54:46 2014 +0000 |
Commit: some\&.committer <some\&.committer@chromium\&.org> |
@@ -65,8 +76,8 @@ Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&. |
# Now do the \*(Aqdrover\*(Aq\&. |
# IMPORTANT!!! Do Not leave off the \*(Aq\-x\*(Aq flag |
-\fB$ git cherry\-pick \-x fd935aae549962611c2f178dc9026f23ae2ad9bd\fR |
-[drover_9999 0f36796] This change needs to go to branch 9999 |
+\fB$ git cherry\-pick \-x 14293306d7969cff815969e2502f47794a63fbc5\fR |
+[drover_9999 3200a8c] This change needs to go to branch 9999 |
Author: some\&.committer <some\&.committer@chromium\&.org> |
Date: Thu Apr 10 08:54:46 2014 +0000 |
1 file changed, 1 insertion(+) |
@@ -75,7 +86,7 @@ Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&. |
# That took the code authored by some\&.commiter and commited it to the |
# branch by branch\&.maintainer (us)\&. |
\fB$ git log \-n 1 \-\-pretty=fuller\fR |
-commit 0f3679662379e7032957abcc7d63e96cec444ec7 |
+commit 3200a8cb2072a7c84aaba52baaecbf5e4d17ad00 |
Author: some\&.committer <some\&.committer@chromium\&.org> |
AuthorDate: Thu Apr 10 08:54:46 2014 +0000 |
Commit: branch\&.maintainer <branch\&.maintainer@chromium\&.org> |
@@ -83,11 +94,11 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000 |
This change needs to go to branch 9999 |
- (cherry picked from commit fd935aae549962611c2f178dc9026f23ae2ad9bd) |
+ (cherry picked from commit 14293306d7969cff815969e2502f47794a63fbc5) |
# Looks good\&. Ship it! |
\fB$ git cl upload\fR |
-# Get LGTM or TBR\&. |
+# Wait for LGTM or TBR it\&. |
\fB$ git cl land\fR |
# Or skip the LGTM/TBR and just \*(Aqgit cl land \-\-bypass\-hooks\*(Aq |
.fi |
@@ -95,9 +106,62 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000 |
.RE |
.\} |
.sp |
+.RE |
+.sp |
+.it 1 an-trap |
+.nr an-no-space-flag 1 |
+.nr an-break-flag 1 |
+.br |
+.ps +1 |
+\fBRevert Example\fR |
+.RS 4 |
+.sp |
+ |
+.sp |
+.if n \{\ |
+.RS 4 |
+.\} |
+.nf |
+# Make sure we have the most up\-to\-date branch sources\&. |
+\fB$ git fetch\fR |
+ |
+# Checkout the branch with the change we want to revert\&. |
+\fB$ git checkout \-b drover_9999 branch\-heads/9999\fR |
+Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&. |
+ |
+# Here\*(Aqs the commit we want to revert\&. |
+\fB$ git log \-n 1\fR |
+commit 4803efead17077ecd40440caef2e78d1c66098cf |
+Author: some\&.committer <some\&.committer@chromium\&.org> |
+Date: Thu Apr 10 08:54:46 2014 +0000 |
+ |
+ This change is horribly broken\&. |
+ |
+# Now do the revert\&. |
+\fB$ git revert 4803efead17077ecd40440caef2e78d1c66098cf\fR |
+ |
+# That reverted the change and committed the revert\&. |
+\fB$ git log \-n 1\fR |
+commit 52350f2809ce71352326f1518feae57ac5152f18 |
+Author: branch\&.maintainer <branch\&.maintainer@chromium\&.org> |
+Date: Thu Apr 10 09:11:36 2014 +0000 |
+ |
+ Revert "This change is horribly broken\&." |
+ |
+ This reverts commit 4803efead17077ecd40440caef2e78d1c66098cf\&. |
+ |
+# As with old drover, reverts are generally OK to commit without LGTM\&. |
+\fB$ git cl upload \-r some\&.committer@chromium\&.org \-\-send\-mail\fR |
+\fB$ git cl land \-\-bypass\-hooks\fR |
+.fi |
+.if n \{\ |
+.RE |
+.\} |
+.sp |
+.RE |
.SH "SEE ALSO" |
.sp |
-\fBgit-cherry-pick\fR(1) |
+\fBgit-cherry-pick\fR(1) \fBgit-revert\fR(1) |
.SH "CHROMIUM DEPOT_TOOLS" |
.sp |
Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&. |