Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(226)

Side by Side Diff: man/man1/git-drover.1

Issue 549643002: Add 'revert' example to git-drover docs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: formatting tweaks Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « man/html/git-drover.html ('k') | man/src/git-drover.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 '\" t 1 '\" t
2 .\" Title: git-drover 2 .\" Title: git-drover
3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] 3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> 4 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
5 .\" Date: 08/25/2014 5 .\" Date: 09/05/2014
6 .\" Manual: Chromium depot_tools Manual 6 .\" Manual: Chromium depot_tools Manual
7 .\" Source: depot_tools f0a4926 7 .\" Source: depot_tools 2171f9c
8 .\" Language: English 8 .\" Language: English
9 .\" 9 .\"
10 .TH "GIT\-DROVER" "1" "08/25/2014" "depot_tools f0a4926" "Chromium depot_tools M anual" 10 .TH "GIT\-DROVER" "1" "09/05/2014" "depot_tools 2171f9c" "Chromium depot_tools M anual"
11 .\" ----------------------------------------------------------------- 11 .\" -----------------------------------------------------------------
12 .\" * Define some portability stuff 12 .\" * Define some portability stuff
13 .\" ----------------------------------------------------------------- 13 .\" -----------------------------------------------------------------
14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
15 .\" http://bugs.debian.org/507673 15 .\" http://bugs.debian.org/507673
16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html 16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18 .ie \n(.g .ds Aq \(aq 18 .ie \n(.g .ds Aq \(aq
19 .el .ds Aq ' 19 .el .ds Aq '
20 .\" ----------------------------------------------------------------- 20 .\" -----------------------------------------------------------------
(...skipping 11 matching lines...) Expand all
32 .SH "SYNOPSIS" 32 .SH "SYNOPSIS"
33 .sp 33 .sp
34 .nf 34 .nf
35 \fIgit drover\fR 35 \fIgit drover\fR
36 .fi 36 .fi
37 .sp 37 .sp
38 .SH "DESCRIPTION" 38 .SH "DESCRIPTION"
39 .sp 39 .sp
40 git drover is NOT IMPLEMENTED yet\&. See the EXAMPLE section for the equivalent sequence of commands to run\&. 40 git drover is NOT IMPLEMENTED yet\&. See the EXAMPLE section for the equivalent sequence of commands to run\&.
41 .SH "EXAMPLE" 41 .SH "EXAMPLE"
42 .SS "PREREQUISITES"
42 .sp 43 .sp
43 Before working with branches, you must \*(Aqgclient sync \-\-with_branch_heads\* (Aq at least once to fetch the branches\&. 44 Before working with branches, you must \fIgclient sync \-\-with_branch_heads\fR at least once to fetch the branches\&.
45 .sp
46 .it 1 an-trap
47 .nr an-no-space-flag 1
48 .nr an-break-flag 1
49 .br
50 .ps +1
51 \fBMerge Example\fR
52 .RS 4
53 .sp
54
44 .sp 55 .sp
45 .if n \{\ 56 .if n \{\
46 .RS 4 57 .RS 4
47 .\} 58 .\}
48 .nf 59 .nf
49 # Make sure we have the most up\-to\-date branch sources\&. 60 # Make sure we have the most up\-to\-date branch sources\&.
50 \fB$ git fetch\fR 61 \fB$ git fetch\fR
51 62
52 # Here\*(Aqs the commit we want to \*(Aqdrover\*(Aq\&. 63 # Here\*(Aqs the commit we want to \*(Aqdrover\*(Aq\&.
53 \fB$ git log \-n 1 \-\-pretty=fuller\fR 64 \fB$ git log \-n 1 \-\-pretty=fuller\fR
54 commit fd935aae549962611c2f178dc9026f23ae2ad9bd 65 commit 14293306d7969cff815969e2502f47794a63fbc5
55 Author: some\&.committer <some\&.committer@chromium\&.org> 66 Author: some\&.committer <some\&.committer@chromium\&.org>
56 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 67 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
57 Commit: some\&.committer <some\&.committer@chromium\&.org> 68 Commit: some\&.committer <some\&.committer@chromium\&.org>
58 CommitDate: Thu Apr 10 08:54:46 2014 +0000 69 CommitDate: Thu Apr 10 08:54:46 2014 +0000
59 70
60 This change needs to go to branch 9999 71 This change needs to go to branch 9999
61 72
62 # Checkout the branch we want to \*(Aqdrover\*(Aq to\&. 73 # Checkout the branch we want to \*(Aqdrover\*(Aq to\&.
63 \fB$ git checkout \-b drover_9999 branch\-heads/9999\fR 74 \fB$ git checkout \-b drover_9999 branch\-heads/9999\fR
64 Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&. 75 Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&.
65 76
66 # Now do the \*(Aqdrover\*(Aq\&. 77 # Now do the \*(Aqdrover\*(Aq\&.
67 # IMPORTANT!!! Do Not leave off the \*(Aq\-x\*(Aq flag 78 # IMPORTANT!!! Do Not leave off the \*(Aq\-x\*(Aq flag
68 \fB$ git cherry\-pick \-x fd935aae549962611c2f178dc9026f23ae2ad9bd\fR 79 \fB$ git cherry\-pick \-x 14293306d7969cff815969e2502f47794a63fbc5\fR
69 [drover_9999 0f36796] This change needs to go to branch 9999 80 [drover_9999 3200a8c] This change needs to go to branch 9999
70 Author: some\&.committer <some\&.committer@chromium\&.org> 81 Author: some\&.committer <some\&.committer@chromium\&.org>
71 Date: Thu Apr 10 08:54:46 2014 +0000 82 Date: Thu Apr 10 08:54:46 2014 +0000
72 1 file changed, 1 insertion(+) 83 1 file changed, 1 insertion(+)
73 create mode 100644 modified_file 84 create mode 100644 modified_file
74 85
75 # That took the code authored by some\&.commiter and commited it to the 86 # That took the code authored by some\&.commiter and commited it to the
76 # branch by branch\&.maintainer (us)\&. 87 # branch by branch\&.maintainer (us)\&.
77 \fB$ git log \-n 1 \-\-pretty=fuller\fR 88 \fB$ git log \-n 1 \-\-pretty=fuller\fR
78 commit 0f3679662379e7032957abcc7d63e96cec444ec7 89 commit 3200a8cb2072a7c84aaba52baaecbf5e4d17ad00
79 Author: some\&.committer <some\&.committer@chromium\&.org> 90 Author: some\&.committer <some\&.committer@chromium\&.org>
80 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 91 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
81 Commit: branch\&.maintainer <branch\&.maintainer@chromium\&.org> 92 Commit: branch\&.maintainer <branch\&.maintainer@chromium\&.org>
82 CommitDate: Thu Apr 10 09:11:36 2014 +0000 93 CommitDate: Thu Apr 10 09:11:36 2014 +0000
83 94
84 This change needs to go to branch 9999 95 This change needs to go to branch 9999
85 96
86 (cherry picked from commit fd935aae549962611c2f178dc9026f23ae2ad9bd) 97 (cherry picked from commit 14293306d7969cff815969e2502f47794a63fbc5)
87 98
88 # Looks good\&. Ship it! 99 # Looks good\&. Ship it!
89 \fB$ git cl upload\fR 100 \fB$ git cl upload\fR
90 # Get LGTM or TBR\&. 101 # Wait for LGTM or TBR it\&.
91 \fB$ git cl land\fR 102 \fB$ git cl land\fR
92 # Or skip the LGTM/TBR and just \*(Aqgit cl land \-\-bypass\-hooks\*(Aq 103 # Or skip the LGTM/TBR and just \*(Aqgit cl land \-\-bypass\-hooks\*(Aq
93 .fi 104 .fi
94 .if n \{\ 105 .if n \{\
95 .RE 106 .RE
96 .\} 107 .\}
97 .sp 108 .sp
109 .RE
110 .sp
111 .it 1 an-trap
112 .nr an-no-space-flag 1
113 .nr an-break-flag 1
114 .br
115 .ps +1
116 \fBRevert Example\fR
117 .RS 4
118 .sp
119
120 .sp
121 .if n \{\
122 .RS 4
123 .\}
124 .nf
125 # Make sure we have the most up\-to\-date branch sources\&.
126 \fB$ git fetch\fR
127
128 # Checkout the branch with the change we want to revert\&.
129 \fB$ git checkout \-b drover_9999 branch\-heads/9999\fR
130 Branch drover_9999 set up to track remote ref refs/branch\-heads/9999\&.
131
132 # Here\*(Aqs the commit we want to revert\&.
133 \fB$ git log \-n 1\fR
134 commit 4803efead17077ecd40440caef2e78d1c66098cf
135 Author: some\&.committer <some\&.committer@chromium\&.org>
136 Date: Thu Apr 10 08:54:46 2014 +0000
137
138 This change is horribly broken\&.
139
140 # Now do the revert\&.
141 \fB$ git revert 4803efead17077ecd40440caef2e78d1c66098cf\fR
142
143 # That reverted the change and committed the revert\&.
144 \fB$ git log \-n 1\fR
145 commit 52350f2809ce71352326f1518feae57ac5152f18
146 Author: branch\&.maintainer <branch\&.maintainer@chromium\&.org>
147 Date: Thu Apr 10 09:11:36 2014 +0000
148
149 Revert "This change is horribly broken\&."
150
151 This reverts commit 4803efead17077ecd40440caef2e78d1c66098cf\&.
152
153 # As with old drover, reverts are generally OK to commit without LGTM\&.
154 \fB$ git cl upload \-r some\&.committer@chromium\&.org \-\-send\-mail\fR
155 \fB$ git cl land \-\-bypass\-hooks\fR
156 .fi
157 .if n \{\
158 .RE
159 .\}
160 .sp
161 .RE
98 .SH "SEE ALSO" 162 .SH "SEE ALSO"
99 .sp 163 .sp
100 \fBgit-cherry-pick\fR(1) 164 \fBgit-cherry-pick\fR(1) \fBgit-revert\fR(1)
101 .SH "CHROMIUM DEPOT_TOOLS" 165 .SH "CHROMIUM DEPOT_TOOLS"
102 .sp 166 .sp
103 Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi st with the development of chromium and related projects\&. Download the tools f rom \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&. 167 Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi st with the development of chromium and related projects\&. Download the tools f rom \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
104 .SH "NOTES" 168 .SH "NOTES"
105 .IP " 1." 4 169 .IP " 1." 4
106 here 170 here
107 .RS 4 171 .RS 4
108 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git 172 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git
109 .RE 173 .RE
OLDNEW
« no previous file with comments | « man/html/git-drover.html ('k') | man/src/git-drover.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698