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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1342383002: Add a git-drover. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 5 years, 2 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
« no previous file with comments | « git_drover.py ('k') | 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 737 matching lines...) Expand 10 before | Expand all | Expand 10 after
748 <p>git-drover - 748 <p>git-drover -
749 Apply a commit from the trunk to a release branch, or from one release branch to another. 749 Apply a commit from the trunk to a release branch, or from one release branch to another.
750 </p> 750 </p>
751 </div> 751 </div>
752 </div> 752 </div>
753 <div id="content"> 753 <div id="content">
754 <div class="sect1"> 754 <div class="sect1">
755 <h2 id="_synopsis">SYNOPSIS</h2> 755 <h2 id="_synopsis">SYNOPSIS</h2>
756 <div class="sectionbody"> 756 <div class="sectionbody">
757 <div class="verseblock"> 757 <div class="verseblock">
758 <pre class="content"><em>git drover</em></pre> 758 <pre class="content"><em>git drover</em> --branch &lt;branch&gt; --cherry-pick & lt;commit&gt;
759 [--parent_checkout &lt;path-to-existing-checkout&gt;]
760 [--verbose] [--dry-run]</pre>
759 <div class="attribution"> 761 <div class="attribution">
760 </div></div> 762 </div></div>
761 </div> 763 </div>
762 </div> 764 </div>
763 <div class="sect1"> 765 <div class="sect1">
764 <h2 id="_description">DESCRIPTION</h2> 766 <h2 id="_description">DESCRIPTION</h2>
765 <div class="sectionbody"> 767 <div class="sectionbody">
766 <div class="paragraph"><p><code>git drover</code> is NOT IMPLEMENTED yet. See th e EXAMPLE section for the equivalent 768 <div class="paragraph"><p><code>git drover</code> applies a commit to a release branch. It creates a new workdir from
767 sequence of commands to run.</p></div> 769 an existing checkout to avoid downloading a new checkout without affecting the
770 existing checkout. Creating a workdir requires symlinks so this does not work on
771 Windows. See the EXAMPLE section for the equivalent sequence of commands to run. </p></div>
772 <div class="paragraph"><p><code>git drover</code> does not support reverts. See the EXAMPLE section for the
773 equivalent sequence of commands to run.</p></div>
768 </div> 774 </div>
769 </div> 775 </div>
770 <div class="sect1"> 776 <div class="sect1">
777 <h2 id="_options">OPTIONS</h2>
778 <div class="sectionbody">
779 <div class="dlist"><dl>
780 <dt class="hdlist1">
781 --branch &lt;branch&gt;
782 </dt>
783 <dd>
784 <p>
785 The branch to cherry-pick the commit to.
786 </p>
787 </dd>
788 <dt class="hdlist1">
789 --cherry-pick &lt;commit&gt;
790 </dt>
791 <dd>
792 <p>
793 The commit to cherry-pick.
794 </p>
795 </dd>
796 <dt class="hdlist1">
797 --parent_checkout
798 </dt>
799 <dd>
800 <p>
801 The path to the chromium checkout to use as the source for a creating
802 git-new-workdir workdir to use for cherry-picking. If unspecified, the current
803 directory is used.
804 </p>
805 </dd>
806 <dt class="hdlist1">
807 -v
808 </dt>
809 <dt class="hdlist1">
810 --verbose
811 </dt>
812 <dd>
813 <p>
814 Enable verbose logging.
815 </p>
816 </dd>
817 <dt class="hdlist1">
818 --dry-run
819 </dt>
820 <dd>
821 <p>
822 Skip landing the cherry-pick. Just ensure that the commit can be cherry-picked
823 into the branch.
824 </p>
825 </dd>
826 </dl></div>
827 </div>
828 </div>
829 <div class="sect1">
771 <h2 id="_example">EXAMPLE</h2> 830 <h2 id="_example">EXAMPLE</h2>
772 <div class="sectionbody"> 831 <div class="sectionbody">
773 <div class="sect2"> 832 <div class="sect2">
774 <h3 id="_prerequisites">PREREQUISITES</h3> 833 <h3 id="_prerequisites">PREREQUISITES</h3>
775 <div class="paragraph"><p>Before working with branches, you must 834 <div class="paragraph"><p>Before working with branches, you must
776 <code>gclient sync --with_branch_heads</code> 835 <code>gclient sync --with_branch_heads</code>
777 at least once to fetch the branches.</p></div> 836 at least once to fetch the branches.</p></div>
778 <div class="sect3"> 837 <div class="sect3">
779 <h4 id="_merge_example">Merge Example</h4> 838 <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. 839 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.
781 <span style="font-weight: bold; color: #ffffff">$ git fetch</span>
782
783 # Here's a commit (from some.committer) that we want to 'drover'.
784 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span> 840 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>
785 commit 4a00a0c3c1bb01f11b42cb70f3ad587026cec02b 841 <span style="color: #e7e71c">commit 8b79b7b2f7e6e728f9a3c7b385c72efc7c47244a</sp an>
786 Author: some.committer &lt;some.committer@chromium.org&gt; 842 Author: some.committer &lt;some.committer@chromium.org&gt;
787 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 843 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
788 Commit: some.committer &lt;some.committer@chromium.org&gt; 844 Commit: some.committer &lt;some.committer@chromium.org&gt;
789 CommitDate: Thu Apr 10 08:54:46 2014 +0000 845 CommitDate: Thu Apr 10 08:54:46 2014 +0000
790 846
791 This change needs to go to branch 9999 847 This change needs to go to branch 9999
792 848
793 # Checkout the branch we want to 'drover' to.
794 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span>
795 Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
796
797 # Now do the 'drover'. 849 # Now do the 'drover'.
798 # IMPORTANT!!! Do Not leave off the '-x' flag 850 <span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --che rry-pick 8b79b7b2f7e6e728f9a3c7b385c72efc7c47244a</span>
799 <span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 4a00a0c3c1b b01f11b42cb70f3ad587026cec02b</span> 851 Going to cherry-pick
800 [drover_9999 19d3d0b] This change needs to go to branch 9999 852 """
801 Author: some.committer &lt;some.committer@chromium.org&gt; 853 <span style="color: #e7e71c">commit 8b79b7b2f7e6e728f9a3c7b385c72efc7c47244a</sp an>
802 Date: Thu Apr 10 08:54:46 2014 +0000 854 Author: some.committer &lt;some.committer@chromium.org&gt;
803 1 file changed, 1 insertion(+) 855 Date: Thu Apr 10 08:54:46 2014 +0000
804 create mode 100644 modified_file
805
806 # That took the code authored by some.committer and committed it to
807 # the branch by the person who drovered it (i.e. you).
808 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>
809 commit 19d3d0b9d8f802df8e2fd563cbc919679d310ecd
810 Author: some.committer &lt;some.committer@chromium.org&gt;
811 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
812 Commit: you &lt;you@chromium.org&gt;
813 CommitDate: Thu Apr 10 09:11:36 2014 +0000
814 856
815 This change needs to go to branch 9999 857 This change needs to go to branch 9999
858 """
859 to 9999. Continue (y/n)? y
816 860
817 (cherry picked from commit 4a00a0c3c1bb01f11b42cb70f3ad587026cec02b) 861 # A cl is uploaded to rietveld, where it can be reviewed before landing.
818 862
819 # Looks good. Ship it! 863 About to land on 9999. Continue (y/n)? y
820 <span style="font-weight: bold; color: #ffffff">$ git cl upload</span> 864 # The cherry-pick cl is landed on the branch 9999.
821 # Wait for LGTM or TBR it.
822 <span style="font-weight: bold; color: #ffffff">$ git cl land</span>
823 # Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'
824 </code></pre></div></div><p><div class="paragraph"></p></div> 865 </code></pre></div></div><p><div class="paragraph"></p></div>
825 </div> 866 </div>
826 <div class="sect3"> 867 <div class="sect3">
827 <h4 id="_revert_example">Revert Example</h4> 868 <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. 869 <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> 870 <span style="font-weight: bold; color: #ffffff">$ git fetch</span>
830 871
831 # Checkout the branch with the change we want to revert. 872 # 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> 873 <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. 874 Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
834 875
835 # Here's the commit we want to revert. 876 # Here's the commit we want to revert.
836 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span> 877 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
837 commit 590b333cbc04d13da67b2a1c5282835d4f27e398 878 <span style="color: #e7e71c">commit 33b0e9164d4564eb8a4b4e5b951bba6edeeecacb</sp an>
838 Author: some.committer &lt;some.committer@chromium.org&gt; 879 Author: some.committer &lt;some.committer@chromium.org&gt;
839 Date: Thu Apr 10 08:54:46 2014 +0000 880 Date: Thu Apr 10 08:54:46 2014 +0000
840 881
841 This change is horribly broken. 882 This change is horribly broken.
842 883
843 # Now do the revert. 884 # Now do the revert.
844 <span style="font-weight: bold; color: #ffffff">$ git revert 590b333cbc04d13da67 b2a1c5282835d4f27e398</span> 885 <span style="font-weight: bold; color: #ffffff">$ git revert 33b0e9164d4564eb8a4 b4e5b951bba6edeeecacb</span>
845 886
846 # That reverted the change and committed the revert. 887 # That reverted the change and committed the revert.
847 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span> 888 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
848 commit 6f541155a9adf98f4e7f94dd561d022fb022d43f 889 <span style="color: #e7e71c">commit 8a2d2bb98b9cfc9260a9bc86da1eec2a43f43f8b</sp an>
849 Author: you &lt;you@chromium.org&gt; 890 Author: you &lt;you@chromium.org&gt;
850 Date: Thu Apr 10 09:11:36 2014 +0000 891 Date: Thu Apr 10 09:11:36 2014 +0000
851 892
852 Revert "This change is horribly broken." 893 Revert "This change is horribly broken."
853 894
854 This reverts commit 590b333cbc04d13da67b2a1c5282835d4f27e398. 895 This reverts commit 33b0e9164d4564eb8a4b4e5b951bba6edeeecacb.
855 896
856 # As with old drover, reverts are generally OK to commit without LGTM. 897 # 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> 898 <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> 899 <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> 900 </code></pre></div></div><p><div class="paragraph"></p></div>
860 </div> 901 </div>
902 <div class="sect3">
903 <h4 id="_manual_merge_example">Manual Merge Example</h4>
904 <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.
905 <span style="font-weight: bold; color: #ffffff">$ git fetch</span>
906
907 # Here's a commit (from some.committer) that we want to 'drover'.
908 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>
909 <span style="color: #e7e71c">commit 537f446fa3d5e41acab017bb0b082fbd0c9eb043</sp an>
910 Author: some.committer &lt;some.committer@chromium.org&gt;
911 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
912 Commit: some.committer &lt;some.committer@chromium.org&gt;
913 CommitDate: Thu Apr 10 08:54:46 2014 +0000
914
915 This change needs to go to branch 9999
916
917 # Checkout the branch we want to 'drover' to.
918 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span>
919 Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
920
921 # Now do the 'drover'.
922 # IMPORTANT!!! Do Not leave off the '-x' flag
923 <span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 537f446fa3d 5e41acab017bb0b082fbd0c9eb043</span>
924 [drover_9999 b468abc] This change needs to go to branch 9999
925 Author: some.committer &lt;some.committer@chromium.org&gt;
926 Date: Thu Apr 10 08:54:46 2014 +0000
927 1 file changed, 1 insertion(+)
928 create mode 100644 modified_file
929
930 # That took the code authored by some.committer and committed it to
931 # the branch by the person who drovered it (i.e. you).
932 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>
933 <span style="color: #e7e71c">commit b468abc42ddd4fd9aecc48c3eda172265306d2b4</sp an>
934 Author: some.committer &lt;some.committer@chromium.org&gt;
935 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
936 Commit: you &lt;you@chromium.org&gt;
937 CommitDate: Thu Apr 10 09:11:36 2014 +0000
938
939 This change needs to go to branch 9999
940
941 (cherry picked from commit 537f446fa3d5e41acab017bb0b082fbd0c9eb043)
942
943 # Looks good. Ship it!
944 <span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
945 # Wait for LGTM or TBR it.
946 <span style="font-weight: bold; color: #ffffff">$ git cl land</span>
947 # Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'
948 </code></pre></div></div><p><div class="paragraph"></p></div>
861 </div> 949 </div>
862 </div> 950 </div>
863 </div> 951 </div>
952 </div>
864 <div class="sect1"> 953 <div class="sect1">
865 <h2 id="_see_also">SEE ALSO</h2> 954 <h2 id="_see_also">SEE ALSO</h2>
866 <div class="sectionbody"> 955 <div class="sectionbody">
867 <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> 956 <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>
868 </div> 957 </div>
869 </div> 958 </div>
870 <div class="sect1"> 959 <div class="sect1">
871 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 960 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
872 <div class="sectionbody"> 961 <div class="sectionbody">
873 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to 962 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to
874 assist with the development of chromium and related projects. Download the tools 963 assist with the development of chromium and related projects. Download the tools
875 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 964 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
876 </div> 965 </div>
877 </div> 966 </div>
878 </div> 967 </div>
879 <div id="footnotes"><hr /></div> 968 <div id="footnotes"><hr /></div>
880 <div id="footer"> 969 <div id="footer">
881 <div id="footer-text"> 970 <div id="footer-text">
882 Last updated 2014-09-09 13:42:13 PDT 971 Last updated 2015-09-23 11:11:58 AEST
883 </div> 972 </div>
884 </div> 973 </div>
885 </body> 974 </body>
886 </html> 975 </html>
OLDNEW
« no previous file with comments | « git_drover.py ('k') | man/man1/git-drover.1 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698