Gitiles
Code Review Sign In
gerrit.openfyde.cn / chromium.googlesource.com / chromium / tools / depot_tools / 43c083d5a4289d0f470be79c9d78b5b9916de3e5 / . / man / html / git-drover.html
blob: 6a5e549f2df96e8520299a4902369dcb876c3d11 [file] [log] [blame]
mmoss@chromium.org62e41c32014-08-20 23:23:28 +0000[diff] [blame]1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4<head>
5<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
6<meta name="generator" content="AsciiDoc 8.6.9" />
7<title>git-drover(1)</title>
8<style type="text/css">
9/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
10
11/* Default font. */
12body {
13 font-family: Georgia,serif;
14}
15
16/* Title font. */
17h1, h2, h3, h4, h5, h6,
18div.title, caption.title,
19thead, p.table.header,
20#toctitle,
21#author, #revnumber, #revdate, #revremark,
22#footer {
23 font-family: Arial,Helvetica,sans-serif;
24}
25
26body {
27 margin: 1em 5% 1em 5%;
28}
29
30a {
31 color: blue;
32 text-decoration: underline;
33}
34a:visited {
35 color: fuchsia;
36}
37
38em {
39 font-style: italic;
40 color: navy;
41}
42
43strong {
44 font-weight: bold;
45 color: #083194;
46}
47
48h1, h2, h3, h4, h5, h6 {
49 color: #527bbd;
50 margin-top: 1.2em;
51 margin-bottom: 0.5em;
52 line-height: 1.3;
53}
54
55h1, h2, h3 {
56 border-bottom: 2px solid silver;
57}
58h2 {
59 padding-top: 0.5em;
60}
61h3 {
62 float: left;
63}
64h3 + * {
65 clear: left;
66}
67h5 {
68 font-size: 1.0em;
69}
70
71div.sectionbody {
72 margin-left: 0;
73}
74
75hr {
76 border: 1px solid silver;
77}
78
79p {
80 margin-top: 0.5em;
81 margin-bottom: 0.5em;
82}
83
84ul, ol, li > p {
85 margin-top: 0;
86}
87ul > li { color: #aaa; }
88ul > li > * { color: black; }
89
90.monospaced, code, pre {
91 font-family: "Courier New", Courier, monospace;
92 font-size: inherit;
93 color: navy;
94 padding: 0;
95 margin: 0;
96}
97pre {
98 white-space: pre-wrap;
99}
100
101#author {
102 color: #527bbd;
103 font-weight: bold;
104 font-size: 1.1em;
105}
106#email {
107}
108#revnumber, #revdate, #revremark {
109}
110
111#footer {
112 font-size: small;
113 border-top: 2px solid silver;
114 padding-top: 0.5em;
115 margin-top: 4.0em;
116}
117#footer-text {
118 float: left;
119 padding-bottom: 0.5em;
120}
121#footer-badges {
122 float: right;
123 padding-bottom: 0.5em;
124}
125
126#preamble {
127 margin-top: 1.5em;
128 margin-bottom: 1.5em;
129}
130div.imageblock, div.exampleblock, div.verseblock,
131div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
132div.admonitionblock {
133 margin-top: 1.0em;
134 margin-bottom: 1.5em;
135}
136div.admonitionblock {
137 margin-top: 2.0em;
138 margin-bottom: 2.0em;
139 margin-right: 10%;
140 color: #606060;
141}
142
143div.content { /* Block element content. */
144 padding: 0;
145}
146
147/* Block element titles. */
148div.title, caption.title {
149 color: #527bbd;
150 font-weight: bold;
151 text-align: left;
152 margin-top: 1.0em;
153 margin-bottom: 0.5em;
154}
155div.title + * {
156 margin-top: 0;
157}
158
159td div.title:first-child {
160 margin-top: 0.0em;
161}
162div.content div.title:first-child {
163 margin-top: 0.0em;
164}
165div.content + div.title {
166 margin-top: 0.0em;
167}
168
169div.sidebarblock > div.content {
170 background: #ffffee;
171 border: 1px solid #dddddd;
172 border-left: 4px solid #f0f0f0;
173 padding: 0.5em;
174}
175
176div.listingblock > div.content {
177 border: 1px solid #dddddd;
178 border-left: 5px solid #f0f0f0;
179 background: #f8f8f8;
180 padding: 0.5em;
181}
182
183div.quoteblock, div.verseblock {
184 padding-left: 1.0em;
185 margin-left: 1.0em;
186 margin-right: 10%;
187 border-left: 5px solid #f0f0f0;
188 color: #888;
189}
190
191div.quoteblock > div.attribution {
192 padding-top: 0.5em;
193 text-align: right;
194}
195
196div.verseblock > pre.content {
197 font-family: inherit;
198 font-size: inherit;
199}
200div.verseblock > div.attribution {
201 padding-top: 0.75em;
202 text-align: left;
203}
204/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
205div.verseblock + div.attribution {
206 text-align: left;
207}
208
209div.admonitionblock .icon {
210 vertical-align: top;
211 font-size: 1.1em;
212 font-weight: bold;
213 text-decoration: underline;
214 color: #527bbd;
215 padding-right: 0.5em;
216}
217div.admonitionblock td.content {
218 padding-left: 0.5em;
219 border-left: 3px solid #dddddd;
220}
221
222div.exampleblock > div.content {
223 border-left: 3px solid #dddddd;
224 padding-left: 0.5em;
225}
226
227div.imageblock div.content { padding-left: 0; }
228span.image img { border-style: none; vertical-align: text-bottom; }
229a.image:visited { color: white; }
230
231dl {
232 margin-top: 0.8em;
233 margin-bottom: 0.8em;
234}
235dt {
236 margin-top: 0.5em;
237 margin-bottom: 0;
238 font-style: normal;
239 color: navy;
240}
241dd > *:first-child {
242 margin-top: 0.1em;
243}
244
245ul, ol {
246 list-style-position: outside;
247}
248ol.arabic {
249 list-style-type: decimal;
250}
251ol.loweralpha {
252 list-style-type: lower-alpha;
253}
254ol.upperalpha {
255 list-style-type: upper-alpha;
256}
257ol.lowerroman {
258 list-style-type: lower-roman;
259}
260ol.upperroman {
261 list-style-type: upper-roman;
262}
263
264div.compact ul, div.compact ol,
265div.compact p, div.compact p,
266div.compact div, div.compact div {
267 margin-top: 0.1em;
268 margin-bottom: 0.1em;
269}
270
271tfoot {
272 font-weight: bold;
273}
274td > div.verse {
275 white-space: pre;
276}
277
278div.hdlist {
279 margin-top: 0.8em;
280 margin-bottom: 0.8em;
281}
282div.hdlist tr {
283 padding-bottom: 15px;
284}
285dt.hdlist1.strong, td.hdlist1.strong {
286 font-weight: bold;
287}
288td.hdlist1 {
289 vertical-align: top;
290 font-style: normal;
291 padding-right: 0.8em;
292 color: navy;
293}
294td.hdlist2 {
295 vertical-align: top;
296}
297div.hdlist.compact tr {
298 margin: 0;
299 padding-bottom: 0;
300}
301
302.comment {
303 background: yellow;
304}
305
306.footnote, .footnoteref {
307 font-size: 0.8em;
308}
309
310span.footnote, span.footnoteref {
311 vertical-align: super;
312}
313
314#footnotes {
315 margin: 20px 0 20px 0;
316 padding: 7px 0 0 0;
317}
318
319#footnotes div.footnote {
320 margin: 0 0 5px 0;
321}
322
323#footnotes hr {
324 border: none;
325 border-top: 1px solid silver;
326 height: 1px;
327 text-align: left;
328 margin-left: 0;
329 width: 20%;
330 min-width: 100px;
331}
332
333div.colist td {
334 padding-right: 0.5em;
335 padding-bottom: 0.3em;
336 vertical-align: top;
337}
338div.colist td img {
339 margin-top: 0.3em;
340}
341
342@media print {
343 #footer-badges { display: none; }
344}
345
346#toc {
347 margin-bottom: 2.5em;
348}
349
350#toctitle {
351 color: #527bbd;
352 font-size: 1.1em;
353 font-weight: bold;
354 margin-top: 1.0em;
355 margin-bottom: 0.1em;
356}
357
358div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
359 margin-top: 0;
360 margin-bottom: 0;
361}
362div.toclevel2 {
363 margin-left: 2em;
364 font-size: 0.9em;
365}
366div.toclevel3 {
367 margin-left: 4em;
368 font-size: 0.9em;
369}
370div.toclevel4 {
371 margin-left: 6em;
372 font-size: 0.9em;
373}
374
375span.aqua { color: aqua; }
376span.black { color: black; }
377span.blue { color: blue; }
378span.fuchsia { color: fuchsia; }
379span.gray { color: gray; }
380span.green { color: green; }
381span.lime { color: lime; }
382span.maroon { color: maroon; }
383span.navy { color: navy; }
384span.olive { color: olive; }
385span.purple { color: purple; }
386span.red { color: red; }
387span.silver { color: silver; }
388span.teal { color: teal; }
389span.white { color: white; }
390span.yellow { color: yellow; }
391
392span.aqua-background { background: aqua; }
393span.black-background { background: black; }
394span.blue-background { background: blue; }
395span.fuchsia-background { background: fuchsia; }
396span.gray-background { background: gray; }
397span.green-background { background: green; }
398span.lime-background { background: lime; }
399span.maroon-background { background: maroon; }
400span.navy-background { background: navy; }
401span.olive-background { background: olive; }
402span.purple-background { background: purple; }
403span.red-background { background: red; }
404span.silver-background { background: silver; }
405span.teal-background { background: teal; }
406span.white-background { background: white; }
407span.yellow-background { background: yellow; }
408
409span.big { font-size: 2em; }
410span.small { font-size: 0.6em; }
411
412span.underline { text-decoration: underline; }
413span.overline { text-decoration: overline; }
414span.line-through { text-decoration: line-through; }
415
416div.unbreakable { page-break-inside: avoid; }
417
418
419/*
420 * xhtml11 specific
421 *
422 * */
423
424div.tableblock {
425 margin-top: 1.0em;
426 margin-bottom: 1.5em;
427}
428div.tableblock > table {
429 border: 3px solid #527bbd;
430}
431thead, p.table.header {
432 font-weight: bold;
433 color: #527bbd;
434}
435p.table {
436 margin-top: 0;
437}
438/* Because the table frame attribute is overriden by CSS in most browsers. */
439div.tableblock > table[frame="void"] {
440 border-style: none;
441}
442div.tableblock > table[frame="hsides"] {
443 border-left-style: none;
444 border-right-style: none;
445}
446div.tableblock > table[frame="vsides"] {
447 border-top-style: none;
448 border-bottom-style: none;
449}
450
451
452/*
453 * html5 specific
454 *
455 * */
456
457table.tableblock {
458 margin-top: 1.0em;
459 margin-bottom: 1.5em;
460}
461thead, p.tableblock.header {
462 font-weight: bold;
463 color: #527bbd;
464}
465p.tableblock {
466 margin-top: 0;
467}
468table.tableblock {
469 border-width: 3px;
470 border-spacing: 0px;
471 border-style: solid;
472 border-color: #527bbd;
473 border-collapse: collapse;
474}
475th.tableblock, td.tableblock {
476 border-width: 1px;
477 padding: 4px;
478 border-style: solid;
479 border-color: #527bbd;
480}
481
482table.tableblock.frame-topbot {
483 border-left-style: hidden;
484 border-right-style: hidden;
485}
486table.tableblock.frame-sides {
487 border-top-style: hidden;
488 border-bottom-style: hidden;
489}
490table.tableblock.frame-none {
491 border-style: hidden;
492}
493
494th.tableblock.halign-left, td.tableblock.halign-left {
495 text-align: left;
496}
497th.tableblock.halign-center, td.tableblock.halign-center {
498 text-align: center;
499}
500th.tableblock.halign-right, td.tableblock.halign-right {
501 text-align: right;
502}
503
504th.tableblock.valign-top, td.tableblock.valign-top {
505 vertical-align: top;
506}
507th.tableblock.valign-middle, td.tableblock.valign-middle {
508 vertical-align: middle;
509}
510th.tableblock.valign-bottom, td.tableblock.valign-bottom {
511 vertical-align: bottom;
512}
513
514
515/*
516 * manpage specific
517 *
518 * */
519
520body.manpage h1 {
521 padding-top: 0.5em;
522 padding-bottom: 0.5em;
523 border-top: 2px solid silver;
524 border-bottom: 2px solid silver;
525}
526body.manpage h2 {
527 border-style: none;
528}
529body.manpage div.sectionbody {
530 margin-left: 3em;
531}
532
533@media print {
534 body.manpage div#toc { display: none; }
535}
536
537
538div.listingblock > div.content {
539 background: rgb(28, 28, 28);
540}
541
542div.listingblock > div > pre > code {
543 color: rgb(187, 187, 187);
544}
545</style>
546<script type="text/javascript">
547/*<![CDATA[*/
548var asciidoc = { // Namespace.
549
550/////////////////////////////////////////////////////////////////////
551// Table Of Contents generator
552/////////////////////////////////////////////////////////////////////
553
554/* Author: Mihai Bazon, September 2002
555 * http://students.infoiasi.ro/~mishoo
556 *
557 * Table Of Content generator
558 * Version: 0.4
559 *
560 * Feel free to use this script under the terms of the GNU General Public
561 * License, as long as you do not remove or alter this notice.
562 */
563
564 /* modified by Troy D. Hanson, September 2006. License: GPL */
565 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
566
567// toclevels = 1..4.
568toc: function (toclevels) {
569
570 function getText(el) {
571 var text = "";
572 for (var i = el.firstChild; i != null; i = i.nextSibling) {
573 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
574 text += i.data;
575 else if (i.firstChild != null)
576 text += getText(i);
577 }
578 return text;
579 }
580
581 function TocEntry(el, text, toclevel) {
582 this.element = el;
583 this.text = text;
584 this.toclevel = toclevel;
585 }
586
587 function tocEntries(el, toclevels) {
588 var result = new Array;
589 var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
590 // Function that scans the DOM tree for header elements (the DOM2
591 // nodeIterator API would be a better technique but not supported by all
592 // browsers).
593 var iterate = function (el) {
594 for (var i = el.firstChild; i != null; i = i.nextSibling) {
595 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
596 var mo = re.exec(i.tagName);
597 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
598 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
599 }
600 iterate(i);
601 }
602 }
603 }
604 iterate(el);
605 return result;
606 }
607
608 var toc = document.getElementById("toc");
609 if (!toc) {
610 return;
611 }
612
613 // Delete existing TOC entries in case we're reloading the TOC.
614 var tocEntriesToRemove = [];
615 var i;
616 for (i = 0; i < toc.childNodes.length; i++) {
617 var entry = toc.childNodes[i];
618 if (entry.nodeName.toLowerCase() == 'div'
619 && entry.getAttribute("class")
620 && entry.getAttribute("class").match(/^toclevel/))
621 tocEntriesToRemove.push(entry);
622 }
623 for (i = 0; i < tocEntriesToRemove.length; i++) {
624 toc.removeChild(tocEntriesToRemove[i]);
625 }
626
627 // Rebuild TOC entries.
628 var entries = tocEntries(document.getElementById("content"), toclevels);
629 for (var i = 0; i < entries.length; ++i) {
630 var entry = entries[i];
631 if (entry.element.id == "")
632 entry.element.id = "_toc_" + i;
633 var a = document.createElement("a");
634 a.href = "#" + entry.element.id;
635 a.appendChild(document.createTextNode(entry.text));
636 var div = document.createElement("div");
637 div.appendChild(a);
638 div.className = "toclevel" + entry.toclevel;
639 toc.appendChild(div);
640 }
641 if (entries.length == 0)
642 toc.parentNode.removeChild(toc);
643},
644
645
646/////////////////////////////////////////////////////////////////////
647// Footnotes generator
648/////////////////////////////////////////////////////////////////////
649
650/* Based on footnote generation code from:
651 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
652 */
653
654footnotes: function () {
655 // Delete existing footnote entries in case we're reloading the footnodes.
656 var i;
657 var noteholder = document.getElementById("footnotes");
658 if (!noteholder) {
659 return;
660 }
661 var entriesToRemove = [];
662 for (i = 0; i < noteholder.childNodes.length; i++) {
663 var entry = noteholder.childNodes[i];
664 if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
665 entriesToRemove.push(entry);
666 }
667 for (i = 0; i < entriesToRemove.length; i++) {
668 noteholder.removeChild(entriesToRemove[i]);
669 }
670
671 // Rebuild footnote entries.
672 var cont = document.getElementById("content");
673 var spans = cont.getElementsByTagName("span");
674 var refs = {};
675 var n = 0;
676 for (i=0; i<spans.length; i++) {
677 if (spans[i].className == "footnote") {
678 n++;
679 var note = spans[i].getAttribute("data-note");
680 if (!note) {
681 // Use [\s\S] in place of . so multi-line matches work.
682 // Because JavaScript has no s (dotall) regex flag.
683 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
684 spans[i].innerHTML =
685 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
686 "' title='View footnote' class='footnote'>" + n + "</a>]";
687 spans[i].setAttribute("data-note", note);
688 }
689 noteholder.innerHTML +=
690 "<div class='footnote' id='_footnote_" + n + "'>" +
691 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
692 n + "</a>. " + note + "</div>";
693 var id =spans[i].getAttribute("id");
694 if (id != null) refs["#"+id] = n;
695 }
696 }
697 if (n == 0)
698 noteholder.parentNode.removeChild(noteholder);
699 else {
700 // Process footnoterefs.
701 for (i=0; i<spans.length; i++) {
702 if (spans[i].className == "footnoteref") {
703 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
704 href = href.match(/#.*/)[0]; // Because IE return full URL.
705 n = refs[href];
706 spans[i].innerHTML =
707 "[<a href='#_footnote_" + n +
708 "' title='View footnote' class='footnote'>" + n + "</a>]";
709 }
710 }
711 }
712},
713
714install: function(toclevels) {
715 var timerId;
716
717 function reinstall() {
718 asciidoc.footnotes();
719 if (toclevels) {
720 asciidoc.toc(toclevels);
721 }
722 }
723
724 function reinstallAndRemoveTimer() {
725 clearInterval(timerId);
726 reinstall();
727 }
728
729 timerId = setInterval(reinstall, 500);
730 if (document.addEventListener)
731 document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
732 else
733 window.onload = reinstallAndRemoveTimer;
734}
735
736}
737asciidoc.install();
738/*]]>*/
739</script>
740</head>
741<body class="manpage">
742<div id="header">
743<h1>
744git-drover(1) Manual Page
745</h1>
746<h2>NAME</h2>
747<div class="sectionbody">
748<p>git-drover -
749 Apply a commit from the trunk to a release branch, or from one release branch to another.
750</p>
751</div>
752</div>
753<div id="content">
754<div class="sect1">
755<h2 id="_synopsis">SYNOPSIS</h2>
756<div class="sectionbody">
757<div class="verseblock">
sammc@chromium.org89901892015-11-03 00:57:48 +0000[diff] [blame]758<pre class="content"><em>git drover</em> --branch &lt;branch&gt;
759 (--cherry-pick &lt;change&gt; | --continue [path_to_workdir] |
760 --abort [path_to_workdir])
sammc@chromium.org900a33f2015-09-29 06:57:09 +0000[diff] [blame]761 [--parent_checkout &lt;path-to-existing-checkout&gt;]
762 [--verbose] [--dry-run]</pre>
mmoss@chromium.org62e41c32014-08-20 23:23:28 +0000[diff] [blame]763<div class="attribution">
764</div></div>
765</div>
766</div>
767<div class="sect1">
768<h2 id="_description">DESCRIPTION</h2>
769<div class="sectionbody">
sammc@chromium.org900a33f2015-09-29 06:57:09 +0000[diff] [blame]770<div class="paragraph"><p><code>git drover</code> applies a commit to a release branch. It creates a new workdir from
771an existing checkout to avoid downloading a new checkout without affecting the
sammc@chromium.org89901892015-11-03 00:57:48 +0000[diff] [blame]772existing checkout.</p></div>
sammc@chromium.org900a33f2015-09-29 06:57:09 +0000[diff] [blame]773<div class="paragraph"><p><code>git drover</code> does not support reverts. See the EXAMPLE section for the
774equivalent sequence of commands to run.</p></div>
775</div>
776</div>
777<div class="sect1">
778<h2 id="_options">OPTIONS</h2>
779<div class="sectionbody">
780<div class="dlist"><dl>
781<dt class="hdlist1">
782--branch &lt;branch&gt;
783</dt>
784<dd>
785<p>
786 The branch to cherry-pick the commit to.
787</p>
788</dd>
789<dt class="hdlist1">
790--cherry-pick &lt;commit&gt;
791</dt>
792<dd>
793<p>
794 The commit to cherry-pick.
795</p>
796</dd>
797<dt class="hdlist1">
sammc@chromium.org89901892015-11-03 00:57:48 +0000[diff] [blame]798--continue [path_to_workdir]
799</dt>
800<dd>
801<p>
802 Continue a cherry-pick that required manual resolution. The path to the drover
803 workdir is optional. If unspecified, the current directory is used.
804</p>
805</dd>
806<dt class="hdlist1">
807--abort [path_to_workdir]
808</dt>
809<dd>
810<p>
811 Abort a cherry-pick that required manual resolution and clean up its workdir.
812 The path to the drover workdir is optional. If unspecified, the current
813 directory is used.
814</p>
815</dd>
816<dt class="hdlist1">
sammc@chromium.org900a33f2015-09-29 06:57:09 +0000[diff] [blame]817--parent_checkout
818</dt>
819<dd>
820<p>
821 The path to the chromium checkout to use as the source for a creating
822 git-new-workdir workdir to use for cherry-picking. If unspecified, the current
823 directory is used.
824</p>
825</dd>
826<dt class="hdlist1">
827-v
828</dt>
829<dt class="hdlist1">
830--verbose
831</dt>
832<dd>
833<p>
834 Enable verbose logging.
835</p>
836</dd>
837<dt class="hdlist1">
838--dry-run
839</dt>
840<dd>
841<p>
842 Skip landing the cherry-pick. Just ensure that the commit can be cherry-picked
843 into the branch.
844</p>
845</dd>
846</dl></div>
mmoss@chromium.org62e41c32014-08-20 23:23:28 +0000[diff] [blame]847</div>
848</div>
849<div class="sect1">
850<h2 id="_example">EXAMPLE</h2>
851<div class="sectionbody">
mmoss@chromium.org44267852014-09-06 00:06:24 +0000[diff] [blame]852<div class="sect2">
853<h3 id="_prerequisites">PREREQUISITES</h3>
854<div class="paragraph"><p>Before working with branches, you must
855<code>gclient sync --with_branch_heads</code>
856at least once to fetch the branches.</p></div>
857<div class="sect3">
858<h4 id="_merge_example">Merge Example</h4>
sammc@chromium.org900a33f2015-09-29 06:57:09 +0000[diff] [blame]859<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.
mmoss@chromium.orga2e54c12014-08-25 23:58:16 +0000[diff] [blame]860<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
Daniel McArdle43c083d2019-05-03 18:02:45 +0000[diff] [blame^]861<span style="color: #e7e71c">commit c980d966aab8516cc651409da4bf21ca8a4a3613</span>
mmoss@chromium.org62e41c32014-08-20 23:23:28 +0000[diff] [blame]862Author: some.committer &lt;some.committer@chromium.org&gt;
863AuthorDate: Thu Apr 10 08:54:46 2014 +0000
864Commit: some.committer &lt;some.committer@chromium.org&gt;
865CommitDate: Thu Apr 10 08:54:46 2014 +0000
866
867 This change needs to go to branch 9999
mmoss@chromium.orga2e54c12014-08-25 23:58:16 +0000[diff] [blame]868
mmoss@chromium.orga2e54c12014-08-25 23:58:16 +0000[diff] [blame]869# Now do the 'drover'.
Daniel McArdle43c083d2019-05-03 18:02:45 +0000[diff] [blame^]870<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick c980d966aab8516cc651409da4bf21ca8a4a3613</span>
sammc@chromium.org900a33f2015-09-29 06:57:09 +0000[diff] [blame]871Going to cherry-pick
872"""
Daniel McArdle43c083d2019-05-03 18:02:45 +0000[diff] [blame^]873<span style="color: #e7e71c">commit c980d966aab8516cc651409da4bf21ca8a4a3613</span>
sammc@chromium.org900a33f2015-09-29 06:57:09 +0000[diff] [blame]874Author: some.committer &lt;some.committer@chromium.org&gt;
875Date: Thu Apr 10 08:54:46 2014 +0000
mmoss@chromium.org62e41c32014-08-20 23:23:28 +0000[diff] [blame]876
877 This change needs to go to branch 9999
sammc@chromium.org900a33f2015-09-29 06:57:09 +0000[diff] [blame]878"""
879to 9999. Continue (y/n)? y
mmoss@chromium.org62e41c32014-08-20 23:23:28 +0000[diff] [blame]880
sammc@chromium.org900a33f2015-09-29 06:57:09 +0000[diff] [blame]881# A cl is uploaded to rietveld, where it can be reviewed before landing.
mmoss@chromium.orga2e54c12014-08-25 23:58:16 +0000[diff] [blame]882
sammc@chromium.org900a33f2015-09-29 06:57:09 +0000[diff] [blame]883About to land on 9999. Continue (y/n)? y
884# The cherry-pick cl is landed on the branch 9999.
mmoss@chromium.org62e41c32014-08-20 23:23:28 +0000[diff] [blame]885</code></pre></div></div><p><div class="paragraph"></p></div>
886</div>
mmoss@chromium.org44267852014-09-06 00:06:24 +0000[diff] [blame]887<div class="sect3">
sammc@chromium.org89901892015-11-03 00:57:48 +0000[diff] [blame]888<h4 id="_merge_with_conflicts_example">Merge with Conflicts Example</h4>
889<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.
890<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
Daniel McArdle43c083d2019-05-03 18:02:45 +0000[diff] [blame^]891<span style="color: #e7e71c">commit 2d78cf765179c7be5e7e6d1e4565a0d3769e9174</span>
sammc@chromium.org89901892015-11-03 00:57:48 +0000[diff] [blame]892Author: some.committer &lt;some.committer@chromium.org&gt;
893AuthorDate: Thu Apr 10 08:54:46 2014 +0000
894Commit: some.committer &lt;some.committer@chromium.org&gt;
895CommitDate: Thu Apr 10 08:54:46 2014 +0000
896
897 This change needs to go to branch 9999
898
899# Now do the 'drover'.
Daniel McArdle43c083d2019-05-03 18:02:45 +0000[diff] [blame^]900<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick 2d78cf765179c7be5e7e6d1e4565a0d3769e9174</span>
sammc@chromium.org89901892015-11-03 00:57:48 +0000[diff] [blame]901Going to cherry-pick
902"""
Daniel McArdle43c083d2019-05-03 18:02:45 +0000[diff] [blame^]903<span style="color: #e7e71c">commit 2d78cf765179c7be5e7e6d1e4565a0d3769e9174</span>
sammc@chromium.org89901892015-11-03 00:57:48 +0000[diff] [blame]904Author: some.committer &lt;some.committer@chromium.org&gt;
905Date: Thu Apr 10 08:54:46 2014 +0000
906
907 This change needs to go to branch 9999
908"""
909to 9999. Continue (y/n)? y
910
911Error: Patch failed to apply.
912
913A workdir for this cherry-pick has been created in
914 /tmp/drover_9999
915
916To continue, resolve the conflicts there and run
917 git drover --continue /tmp/drover_9999
918
919To abort this cherry-pick run
920 git drover --abort /tmp/drover_9999
921
922<span style="font-weight: bold; color: #ffffff">$ pushd /tmp/drover_9999</span>
923# Manually resolve conflicts.
924<span style="font-weight: bold; color: #ffffff">$ git add path/to/file_with_conflicts</span>
925<span style="font-weight: bold; color: #ffffff">$ popd</span>
926<span style="font-weight: bold; color: #ffffff">$ git drover --continue /tmp/drover_9999</span>
927
928# A cl is uploaded to rietveld, where it can be reviewed before landing.
929
930About to land on 9999. Continue (y/n)? y
931# The cherry-pick cl is landed on the branch 9999.
932</code></pre></div></div><p><div class="paragraph"></p></div>
933</div>
934<div class="sect3">
mmoss@chromium.org44267852014-09-06 00:06:24 +0000[diff] [blame]935<h4 id="_revert_example">Revert Example</h4>
936<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Make sure we have the most up-to-date branch sources.
937<span style="font-weight: bold; color: #ffffff">$ git fetch</span>
938
939# Checkout the branch with the change we want to revert.
940<span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 branch-heads/9999</span>
Daniel McArdle43c083d2019-05-03 18:02:45 +0000[diff] [blame^]941Branch 'drover_9999' set up to track remote ref 'refs/branch-heads/9999'.
mmoss@chromium.org44267852014-09-06 00:06:24 +0000[diff] [blame]942
943# Here's the commit we want to revert.
944<span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
Daniel McArdle43c083d2019-05-03 18:02:45 +0000[diff] [blame^]945<span style="color: #e7e71c">commit 54f88a53372983c7aecacfb9a4d2fa63501fda58</span>
mmoss@chromium.org44267852014-09-06 00:06:24 +0000[diff] [blame]946Author: some.committer &lt;some.committer@chromium.org&gt;
947Date: Thu Apr 10 08:54:46 2014 +0000
948
949 This change is horribly broken.
950
951# Now do the revert.
Daniel McArdle43c083d2019-05-03 18:02:45 +0000[diff] [blame^]952<span style="font-weight: bold; color: #ffffff">$ git revert 54f88a53372983c7aecacfb9a4d2fa63501fda58</span>
mmoss@chromium.org44267852014-09-06 00:06:24 +0000[diff] [blame]953
954# That reverted the change and committed the revert.
955<span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
Daniel McArdle43c083d2019-05-03 18:02:45 +0000[diff] [blame^]956<span style="color: #e7e71c">commit 4d932bdd1071e318e6a4d3d6fd6034f9105cad5a</span>
mmoss@chromium.org6f9c7cf2014-09-09 21:06:30 +0000[diff] [blame]957Author: you &lt;you@chromium.org&gt;
mmoss@chromium.org44267852014-09-06 00:06:24 +0000[diff] [blame]958Date: Thu Apr 10 09:11:36 2014 +0000
959
960 Revert "This change is horribly broken."
961
Daniel McArdle43c083d2019-05-03 18:02:45 +0000[diff] [blame^]962 This reverts commit 54f88a53372983c7aecacfb9a4d2fa63501fda58.
mmoss@chromium.org44267852014-09-06 00:06:24 +0000[diff] [blame]963
964# As with old drover, reverts are generally OK to commit without LGTM.
965<span style="font-weight: bold; color: #ffffff">$ git cl upload -r some.committer@chromium.org --send-mail</span>
966<span style="font-weight: bold; color: #ffffff">$ git cl land --bypass-hooks</span>
967</code></pre></div></div><p><div class="paragraph"></p></div>
Aaron Gable97561042017-06-21 09:38:37 -0700[diff] [blame]968<div class="paragraph"><p>If your cherrypick onto a release branch gets reverted, do not create a new
969cherrypick from master onto that release branch. Instead, use the "Reland"
970button on the original cherrypick CL.</p></div>
mmoss@chromium.org44267852014-09-06 00:06:24 +0000[diff] [blame]971</div>
sammc@chromium.org900a33f2015-09-29 06:57:09 +0000[diff] [blame]972<div class="sect3">
973<h4 id="_manual_merge_example">Manual Merge Example</h4>
974<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Make sure we have the most up-to-date branch sources.
975<span style="font-weight: bold; color: #ffffff">$ git fetch</span>
976
977# Here's a commit (from some.committer) that we want to 'drover'.
978<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
Daniel McArdle43c083d2019-05-03 18:02:45 +0000[diff] [blame^]979<span style="color: #e7e71c">commit 8ed5a6585548f2092890b404f6ff49bd5ce6ab9a</span>
sammc@chromium.org900a33f2015-09-29 06:57:09 +0000[diff] [blame]980Author: some.committer &lt;some.committer@chromium.org&gt;
981AuthorDate: Thu Apr 10 08:54:46 2014 +0000
982Commit: some.committer &lt;some.committer@chromium.org&gt;
983CommitDate: Thu Apr 10 08:54:46 2014 +0000
984
985 This change needs to go to branch 9999
986
987# Checkout the branch we want to 'drover' to.
988<span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 branch-heads/9999</span>
Daniel McArdle43c083d2019-05-03 18:02:45 +0000[diff] [blame^]989Branch 'drover_9999' set up to track remote ref 'refs/branch-heads/9999'.
sammc@chromium.org900a33f2015-09-29 06:57:09 +0000[diff] [blame]990
991# Now do the 'drover'.
992# IMPORTANT!!! Do Not leave off the '-x' flag
Daniel McArdle43c083d2019-05-03 18:02:45 +0000[diff] [blame^]993<span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 8ed5a6585548f2092890b404f6ff49bd5ce6ab9a</span>
994[drover_9999 77a956b] This change needs to go to branch 9999
sammc@chromium.org900a33f2015-09-29 06:57:09 +0000[diff] [blame]995 Author: some.committer &lt;some.committer@chromium.org&gt;
996 Date: Thu Apr 10 08:54:46 2014 +0000
997 1 file changed, 1 insertion(+)
998 create mode 100644 modified_file
999
1000# That took the code authored by some.committer and committed it to
1001# the branch by the person who drovered it (i.e. you).
1002<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
Daniel McArdle43c083d2019-05-03 18:02:45 +0000[diff] [blame^]1003<span style="color: #e7e71c">commit 77a956ba0f28eb29ed009f58a5d71b6a10283358</span>
sammc@chromium.org900a33f2015-09-29 06:57:09 +0000[diff] [blame]1004Author: some.committer &lt;some.committer@chromium.org&gt;
1005AuthorDate: Thu Apr 10 08:54:46 2014 +0000
1006Commit: you &lt;you@chromium.org&gt;
1007CommitDate: Thu Apr 10 09:11:36 2014 +0000
1008
1009 This change needs to go to branch 9999
1010
Daniel McArdle43c083d2019-05-03 18:02:45 +0000[diff] [blame^]1011 (cherry picked from commit 8ed5a6585548f2092890b404f6ff49bd5ce6ab9a)
sammc@chromium.org900a33f2015-09-29 06:57:09 +0000[diff] [blame]1012
1013# Looks good. Ship it!
1014<span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
1015# Wait for LGTM or TBR it.
1016<span style="font-weight: bold; color: #ffffff">$ git cl land</span>
1017# Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'
1018</code></pre></div></div><p><div class="paragraph"></p></div>
Aaron Gable97561042017-06-21 09:38:37 -0700[diff] [blame]1019<div class="paragraph"><p>If <code>git cl upload</code> errors out, the branch you&#8217;re uploading to probably has a CL
1020with the same Change-Id. Instead of cherry-picking manually, use the Reland
1021button in the Gerrit UI to create a new CL, and patch that CL into your client.</p></div>
sammc@chromium.org900a33f2015-09-29 06:57:09 +0000[diff] [blame]1022</div>
mmoss@chromium.org44267852014-09-06 00:06:24 +0000[diff] [blame]1023</div>
1024</div>
mmoss@chromium.org62e41c32014-08-20 23:23:28 +0000[diff] [blame]1025</div>
1026<div class="sect1">
1027<h2 id="_see_also">SEE ALSO</h2>
1028<div class="sectionbody">
mmoss@chromium.org6f9c7cf2014-09-09 21:06:30 +0000[diff] [blame]1029<div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a>, <a href="git-revert.html">git-revert(1)</a></p></div>
mmoss@chromium.org62e41c32014-08-20 23:23:28 +0000[diff] [blame]1030</div>
1031</div>
1032<div class="sect1">
1033<h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
1034<div class="sectionbody">
1035<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
1036assist with the development of chromium and related projects. Download the tools
Quinten Yearsley442fb642016-12-15 15:38:27 -0800[diff] [blame]1037from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
mmoss@chromium.org62e41c32014-08-20 23:23:28 +0000[diff] [blame]1038</div>
1039</div>
1040</div>
1041<div id="footnotes"><hr /></div>
1042<div id="footer">
1043<div id="footer-text">
Daniel McArdle43c083d2019-05-03 18:02:45 +0000[diff] [blame^]1044Last updated 2019-05-03 10:40:16 EDT
mmoss@chromium.org62e41c32014-08-20 23:23:28 +0000[diff] [blame]1045</div>
1046</div>
1047</body>
1048</html>