Chromium Code Reviews Chromium Code Reviews
Issue 507513002:
Add some more context to git-drover tutorial. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools| OLD | NEW |
|---|---|
| 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" | 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" |
| 2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | 2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
| 3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> | 3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> |
| 4 <head> | 4 <head> |
| 5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" / > | 5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" / > |
| 6 <meta name="generator" content="AsciiDoc 8.6.9" /> | 6 <meta name="generator" content="AsciiDoc 8.6.9" /> |
| 7 <title>git-drover(1)</title> | 7 <title>git-drover(1)</title> |
| 8 <style type="text/css"> | 8 <style type="text/css"> |
| 9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ | 9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ |
| 10 | 10 |
| (...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 763 <div class="sect1"> | 763 <div class="sect1"> |
| 764 <h2 id="_description">DESCRIPTION</h2> | 764 <h2 id="_description">DESCRIPTION</h2> |
| 765 <div class="sectionbody"> | 765 <div class="sectionbody"> |
| 766 <div class="paragraph"><p><code>git drover</code> is NOT IMPLEMENTED yet. See th e EXAMPLE section for the equivalent | 766 <div class="paragraph"><p><code>git drover</code> is NOT IMPLEMENTED yet. See th e EXAMPLE section for the equivalent |
| 767 sequence of commands to run.</p></div> | 767 sequence of commands to run.</p></div> |
| 768 </div> | 768 </div> |
| 769 </div> | 769 </div> |
| 770 <div class="sect1"> | 770 <div class="sect1"> |
| 771 <h2 id="_example">EXAMPLE</h2> | 771 <h2 id="_example">EXAMPLE</h2> |
| 772 <div class="sectionbody"> | 772 <div class="sectionbody"> |
| 773 <div class="paragraph"><p> Before working with branches, you must 'gclient sync --with_branch_heads' at least once to fetch the branches.</p></div><div class="l istingblock"><div class="content"><pre><code><span style="font-weight: bold; col or: #ffffff">$ git log -n 1 --pretty=fuller</span> | 773 <div class="paragraph"><p> Before working with branches, you must 'gclient sync --with_branch_heads' at least once to fetch the branches.</p></div><div class="l istingblock"><div class="content"><pre><code># Make sure we have the most up-to- date branch sources. |
| 774 commit 49fde8547a38bf27d38cbf3fac783cdf2ddc5f47 | 774 <span style="font-weight: bold; color: #ffffff">$ git fetch</span> |
| 775 | |
| 776 # Here's the commit we want to 'drover'. | |
| 777 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span> | |
| 778 commit f2fd854923021e998fb05be132acf5bd2f803ae6 | |
| 775 Author: some.committer <some.committer@chromium.org> | 779 Author: some.committer <some.committer@chromium.org> |
| 776 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 | 780 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 |
| 777 Commit: some.committer <some.committer@chromium.org> | 781 Commit: some.committer <some.committer@chromium.org> |
| 778 CommitDate: Thu Apr 10 08:54:46 2014 +0000 | 782 CommitDate: Thu Apr 10 08:54:46 2014 +0000 |
| 779 | 783 |
| 780 This change needs to go to branch 9999 | 784 This change needs to go to branch 9999 |
| 785 | |
| 786 # Checkout the branch we want to 'drover' to. | |
| 781 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span> | 787 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span> |
| 782 Branch drover_9999 set up to track remote ref refs/branch-heads/9999. | 788 Branch drover_9999 set up to track remote ref refs/branch-heads/9999. |
| 783 # DO NOT leave off the '-x' flag | 789 |
| 784 <span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 49fde8547a3 8bf27d38cbf3fac783cdf2ddc5f47</span> | 790 # Now do the 'drover'. |
| 785 [drover_9999 1e33c2c] This change needs to go to branch 9999 | 791 # IMPORTANT!!! Do Not leave off the '-x' flag |
|
iannucci
2014/08/25 23:38:37
somewhat less important now, but yeah
| |
| 792 <span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x f2fd8549230 21e998fb05be132acf5bd2f803ae6</span> | |
| 793 [drover_9999 5945bbc] This change needs to go to branch 9999 | |
| 786 Author: some.committer <some.committer@chromium.org> | 794 Author: some.committer <some.committer@chromium.org> |
| 787 Date: Thu Apr 10 08:54:46 2014 +0000 | 795 Date: Thu Apr 10 08:54:46 2014 +0000 |
| 788 1 file changed, 1 insertion(+) | 796 1 file changed, 1 insertion(+) |
| 789 create mode 100644 modified_file | 797 create mode 100644 modified_file |
| 798 | |
| 799 # That took the code authored by some.commiter and commited it to the | |
| 800 # branch by branch.maintainer (us). | |
| 790 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span> | 801 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span> |
| 791 commit 1e33c2ccf642703a6c1c582210fe63980dc6c45b | 802 commit 5945bbc3e3b6c48a53239cde67bcaf1f332c1830 |
| 792 Author: some.committer <some.committer@chromium.org> | 803 Author: some.committer <some.committer@chromium.org> |
| 793 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 | 804 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 |
| 794 Commit: branch.maintainer <branch.maintainer@chromium.org> | 805 Commit: branch.maintainer <branch.maintainer@chromium.org> |
| 795 CommitDate: Thu Apr 10 09:11:36 2014 +0000 | 806 CommitDate: Thu Apr 10 09:11:36 2014 +0000 |
| 796 | 807 |
| 797 This change needs to go to branch 9999 | 808 This change needs to go to branch 9999 |
| 798 | 809 |
| 799 (cherry picked from commit 49fde8547a38bf27d38cbf3fac783cdf2ddc5f47) | 810 (cherry picked from commit f2fd854923021e998fb05be132acf5bd2f803ae6) |
| 811 | |
| 812 # Looks good. Ship it! | |
| 800 <span style="font-weight: bold; color: #ffffff">$ git cl upload</span> | 813 <span style="font-weight: bold; color: #ffffff">$ git cl upload</span> |
| 801 # Get LGTM or TBR. | 814 # Get LGTM or TBR. |
| 802 <span style="font-weight: bold; color: #ffffff">$ git cl land</span> | 815 <span style="font-weight: bold; color: #ffffff">$ git cl land</span> |
| 803 </code></pre></div></div><p><div class="paragraph"></p></div> | 816 </code></pre></div></div><p><div class="paragraph"></p></div> |
| 804 </div> | 817 </div> |
| 805 </div> | 818 </div> |
| 806 <div class="sect1"> | 819 <div class="sect1"> |
| 807 <h2 id="_see_also">SEE ALSO</h2> | 820 <h2 id="_see_also">SEE ALSO</h2> |
| 808 <div class="sectionbody"> | 821 <div class="sectionbody"> |
| 809 <div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a>< /p></div> | 822 <div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a>< /p></div> |
| 810 </div> | 823 </div> |
| 811 </div> | 824 </div> |
| 812 <div class="sect1"> | 825 <div class="sect1"> |
| 813 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> | 826 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> |
| 814 <div class="sectionbody"> | 827 <div class="sectionbody"> |
| 815 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to | 828 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to |
| 816 assist with the development of chromium and related projects. Download the tools | 829 assist with the development of chromium and related projects. Download the tools |
| 817 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> | 830 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> |
| 818 </div> | 831 </div> |
| 819 </div> | 832 </div> |
| 820 </div> | 833 </div> |
| 821 <div id="footnotes"><hr /></div> | 834 <div id="footnotes"><hr /></div> |
| 822 <div id="footer"> | 835 <div id="footer"> |
| 823 <div id="footer-text"> | 836 <div id="footer-text"> |
| 824 Last updated 2014-08-20 16:12:01 PDT | 837 Last updated 2014-08-25 16:26:19 PDT |
| 825 </div> | 838 </div> |
| 826 </div> | 839 </div> |
| 827 </body> | 840 </body> |
| 828 </html> | 841 </html> |
| OLD | NEW |
