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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: man/html/git-drover.html

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 | « no previous file | man/man1/git-drover.1 » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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># Make sure we have the most up-to- date branch sources. 773 <div class="sect2">
774 <h3 id="_prerequisites">PREREQUISITES</h3>
775 <div class="paragraph"><p>Before working with branches, you must
776 <code>gclient sync --with_branch_heads</code>
777 at least once to fetch the branches.</p></div>
778 <div class="sect3">
779 <h4 id="_merge_example">Merge Example</h4>
780 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code># Make sure we have the most up-to-date branch sources.
774 <span style="font-weight: bold; color: #ffffff">$ git fetch</span> 781 <span style="font-weight: bold; color: #ffffff">$ git fetch</span>
775 782
776 # Here's the commit we want to 'drover'. 783 # Here's the commit we want to 'drover'.
777 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span> 784 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>
778 commit 19b478428049b956b2dc389893c9ed7c05d1b175 785 commit 1077c7acbc1f1881d5181f6b1eaf4d0c6cd92543
779 Author: some.committer &lt;some.committer@chromium.org&gt; 786 Author: some.committer &lt;some.committer@chromium.org&gt;
780 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 787 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
781 Commit: some.committer &lt;some.committer@chromium.org&gt; 788 Commit: some.committer &lt;some.committer@chromium.org&gt;
782 CommitDate: Thu Apr 10 08:54:46 2014 +0000 789 CommitDate: Thu Apr 10 08:54:46 2014 +0000
783 790
784 This change needs to go to branch 9999 791 This change needs to go to branch 9999
785 792
786 # Checkout the branch we want to 'drover' to. 793 # Checkout the branch we want to 'drover' to.
787 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span> 794 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span>
788 Branch drover_9999 set up to track remote ref refs/branch-heads/9999. 795 Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
789 796
790 # Now do the 'drover'. 797 # Now do the 'drover'.
791 # IMPORTANT!!! Do Not leave off the '-x' flag 798 # IMPORTANT!!! Do Not leave off the '-x' flag
792 <span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 19b47842804 9b956b2dc389893c9ed7c05d1b175</span> 799 <span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 1077c7acbc1 f1881d5181f6b1eaf4d0c6cd92543</span>
793 [drover_9999 88e74e0] This change needs to go to branch 9999 800 [drover_9999 1d9c1a1] This change needs to go to branch 9999
794 Author: some.committer &lt;some.committer@chromium.org&gt; 801 Author: some.committer &lt;some.committer@chromium.org&gt;
795 Date: Thu Apr 10 08:54:46 2014 +0000 802 Date: Thu Apr 10 08:54:46 2014 +0000
796 1 file changed, 1 insertion(+) 803 1 file changed, 1 insertion(+)
797 create mode 100644 modified_file 804 create mode 100644 modified_file
798 805
799 # That took the code authored by some.commiter and commited it to the 806 # That took the code authored by some.commiter and commited it to the
800 # branch by branch.maintainer (us). 807 # branch by branch.maintainer (us).
801 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span> 808 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>
802 commit 88e74e0f2540eba7bc7bd4d6adb4b0d7923c9488 809 commit 1d9c1a1b768f2248c884495f4d47739c2ff249f7
803 Author: some.committer &lt;some.committer@chromium.org&gt; 810 Author: some.committer &lt;some.committer@chromium.org&gt;
804 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 811 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
805 Commit: branch.maintainer &lt;branch.maintainer@chromium.org&gt; 812 Commit: branch.maintainer &lt;branch.maintainer@chromium.org&gt;
806 CommitDate: Thu Apr 10 09:11:36 2014 +0000 813 CommitDate: Thu Apr 10 09:11:36 2014 +0000
807 814
808 This change needs to go to branch 9999 815 This change needs to go to branch 9999
809 816
810 (cherry picked from commit 19b478428049b956b2dc389893c9ed7c05d1b175) 817 (cherry picked from commit 1077c7acbc1f1881d5181f6b1eaf4d0c6cd92543)
811 818
812 # Looks good. Ship it! 819 # Looks good. Ship it!
813 <span style="font-weight: bold; color: #ffffff">$ git cl upload</span> 820 <span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
814 # Get LGTM or TBR. 821 # Wait for LGTM or TBR it.
815 <span style="font-weight: bold; color: #ffffff">$ git cl land</span> 822 <span style="font-weight: bold; color: #ffffff">$ git cl land</span>
816 # Or skip the LGTM/TBR and just 'git cl land --bypass-hooks' 823 # Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'
817 </code></pre></div></div><p><div class="paragraph"></p></div> 824 </code></pre></div></div><p><div class="paragraph"></p></div>
818 </div> 825 </div>
826 <div class="sect3">
827 <h4 id="_revert_example">Revert Example</h4>
828 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code># Make sure we have the most up-to-date branch sources.
829 <span style="font-weight: bold; color: #ffffff">$ git fetch</span>
830
831 # Checkout the branch with the change we want to revert.
832 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span>
833 Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
834
835 # Here's the commit we want to revert.
836 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
837 commit aca17ebfc070673e98afb6d36f6028eae6b0b8ca
838 Author: some.committer &lt;some.committer@chromium.org&gt;
839 Date: Thu Apr 10 08:54:46 2014 +0000
840
841 This change is horribly broken.
842
843 # Now do the revert.
844 <span style="font-weight: bold; color: #ffffff">$ git revert aca17ebfc070673e98a fb6d36f6028eae6b0b8ca</span>
845
846 # That reverted the change and committed the revert.
847 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
848 commit d27f8f3fd56621c5e3a92cb5e64100e2bc2137a2
849 Author: branch.maintainer &lt;branch.maintainer@chromium.org&gt;
850 Date: Thu Apr 10 09:11:36 2014 +0000
851
852 Revert "This change is horribly broken."
853
854 This reverts commit aca17ebfc070673e98afb6d36f6028eae6b0b8ca.
855
856 # As with old drover, reverts are generally OK to commit without LGTM.
857 <span style="font-weight: bold; color: #ffffff">$ git cl upload -r some.committe r@chromium.org --send-mail</span>
858 <span style="font-weight: bold; color: #ffffff">$ git cl land --bypass-hooks</sp an>
859 </code></pre></div></div><p><div class="paragraph"></p></div>
860 </div>
861 </div>
862 </div>
819 </div> 863 </div>
820 <div class="sect1"> 864 <div class="sect1">
821 <h2 id="_see_also">SEE ALSO</h2> 865 <h2 id="_see_also">SEE ALSO</h2>
822 <div class="sectionbody"> 866 <div class="sectionbody">
823 <div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a>< /p></div> 867 <div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a>
868 <a href="git-revert.html">git-revert(1)</a></p></div>
824 </div> 869 </div>
825 </div> 870 </div>
826 <div class="sect1"> 871 <div class="sect1">
827 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 872 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
828 <div class="sectionbody"> 873 <div class="sectionbody">
829 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to 874 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to
830 assist with the development of chromium and related projects. Download the tools 875 assist with the development of chromium and related projects. Download the tools
831 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 876 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
832 </div> 877 </div>
833 </div> 878 </div>
834 </div> 879 </div>
835 <div id="footnotes"><hr /></div> 880 <div id="footnotes"><hr /></div>
836 <div id="footer"> 881 <div id="footer">
837 <div id="footer-text"> 882 <div id="footer-text">
838 Last updated 2014-08-25 16:45:38 PDT 883 Last updated 2014-09-05 16:32:10 PDT
839 </div> 884 </div>
840 </div> 885 </div>
841 </body> 886 </body>
842 </html> 887 </html>
OLDNEW
« no previous file with comments | « no previous file | man/man1/git-drover.1 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698