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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2170623003: Update docs with latest changes (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools@asciidoc
Patch Set: Created 4 years, 5 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 | « man/html/git-cherry-pick-upload.html ('k') | man/html/git-footers.html » ('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 840 matching lines...) Expand 10 before | Expand all | Expand 10 after
851 <div class="sectionbody"> 851 <div class="sectionbody">
852 <div class="sect2"> 852 <div class="sect2">
853 <h3 id="_prerequisites">PREREQUISITES</h3> 853 <h3 id="_prerequisites">PREREQUISITES</h3>
854 <div class="paragraph"><p>Before working with branches, you must 854 <div class="paragraph"><p>Before working with branches, you must
855 <code>gclient sync --with_branch_heads</code> 855 <code>gclient sync --with_branch_heads</code>
856 at least once to fetch the branches.</p></div> 856 at least once to fetch the branches.</p></div>
857 <div class="sect3"> 857 <div class="sect3">
858 <h4 id="_merge_example">Merge Example</h4> 858 <h4 id="_merge_example">Merge Example</h4>
859 <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'. 859 <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'.
860 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span> 860 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>
861 <span style="color: #e7e71c">commit f7448045de01b54914db8b902ca77fbbf42b3146</sp an> 861 <span style="color: #e7e71c">commit f1b2947cd99ad36614e71a51a925a6dae060fecd</sp an>
862 Author: some.committer &lt;some.committer@chromium.org&gt; 862 Author: some.committer &lt;some.committer@chromium.org&gt;
863 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 863 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
864 Commit: some.committer &lt;some.committer@chromium.org&gt; 864 Commit: some.committer &lt;some.committer@chromium.org&gt;
865 CommitDate: Thu Apr 10 08:54:46 2014 +0000 865 CommitDate: Thu Apr 10 08:54:46 2014 +0000
866 866
867 This change needs to go to branch 9999 867 This change needs to go to branch 9999
868 868
869 # Now do the 'drover'. 869 # Now do the 'drover'.
870 <span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --che rry-pick f7448045de01b54914db8b902ca77fbbf42b3146</span> 870 <span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --che rry-pick f1b2947cd99ad36614e71a51a925a6dae060fecd</span>
871 Going to cherry-pick 871 Going to cherry-pick
872 """ 872 """
873 <span style="color: #e7e71c">commit f7448045de01b54914db8b902ca77fbbf42b3146</sp an> 873 <span style="color: #e7e71c">commit f1b2947cd99ad36614e71a51a925a6dae060fecd</sp an>
874 Author: some.committer &lt;some.committer@chromium.org&gt; 874 Author: some.committer &lt;some.committer@chromium.org&gt;
875 Date: Thu Apr 10 08:54:46 2014 +0000 875 Date: Thu Apr 10 08:54:46 2014 +0000
876 876
877 This change needs to go to branch 9999 877 This change needs to go to branch 9999
878 """ 878 """
879 to 9999. Continue (y/n)? y 879 to 9999. Continue (y/n)? y
880 880
881 # A cl is uploaded to rietveld, where it can be reviewed before landing. 881 # A cl is uploaded to rietveld, where it can be reviewed before landing.
882 882
883 About to land on 9999. Continue (y/n)? y 883 About to land on 9999. Continue (y/n)? y
884 # The cherry-pick cl is landed on the branch 9999. 884 # The cherry-pick cl is landed on the branch 9999.
885 </code></pre></div></div><p><div class="paragraph"></p></div> 885 </code></pre></div></div><p><div class="paragraph"></p></div>
886 </div> 886 </div>
887 <div class="sect3"> 887 <div class="sect3">
888 <h4 id="_merge_with_conflicts_example">Merge with Conflicts Example</h4> 888 <h4 id="_merge_with_conflicts_example">Merge with Conflicts Example</h4>
889 <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'. 889 <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'.
890 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span> 890 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>
891 <span style="color: #e7e71c">commit ca8e437616d853cb10008a252b54cfed928f157c</sp an> 891 <span style="color: #e7e71c">commit 78d5e1beb49c2bfa0369a2712dd1b4a502805a77</sp an>
892 Author: some.committer &lt;some.committer@chromium.org&gt; 892 Author: some.committer &lt;some.committer@chromium.org&gt;
893 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 893 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
894 Commit: some.committer &lt;some.committer@chromium.org&gt; 894 Commit: some.committer &lt;some.committer@chromium.org&gt;
895 CommitDate: Thu Apr 10 08:54:46 2014 +0000 895 CommitDate: Thu Apr 10 08:54:46 2014 +0000
896 896
897 This change needs to go to branch 9999 897 This change needs to go to branch 9999
898 898
899 # Now do the 'drover'. 899 # Now do the 'drover'.
900 <span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --che rry-pick ca8e437616d853cb10008a252b54cfed928f157c</span> 900 <span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --che rry-pick 78d5e1beb49c2bfa0369a2712dd1b4a502805a77</span>
901 Going to cherry-pick 901 Going to cherry-pick
902 """ 902 """
903 <span style="color: #e7e71c">commit ca8e437616d853cb10008a252b54cfed928f157c</sp an> 903 <span style="color: #e7e71c">commit 78d5e1beb49c2bfa0369a2712dd1b4a502805a77</sp an>
904 Author: some.committer &lt;some.committer@chromium.org&gt; 904 Author: some.committer &lt;some.committer@chromium.org&gt;
905 Date: Thu Apr 10 08:54:46 2014 +0000 905 Date: Thu Apr 10 08:54:46 2014 +0000
906 906
907 This change needs to go to branch 9999 907 This change needs to go to branch 9999
908 """ 908 """
909 to 9999. Continue (y/n)? y 909 to 9999. Continue (y/n)? y
910 910
911 Error: Patch failed to apply. 911 Error: Patch failed to apply.
912 912
913 A workdir for this cherry-pick has been created in 913 A workdir for this cherry-pick has been created in
(...skipping 21 matching lines...) Expand all
935 <h4 id="_revert_example">Revert Example</h4> 935 <h4 id="_revert_example">Revert Example</h4>
936 <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. 936 <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.
937 <span style="font-weight: bold; color: #ffffff">$ git fetch</span> 937 <span style="font-weight: bold; color: #ffffff">$ git fetch</span>
938 938
939 # Checkout the branch with the change we want to revert. 939 # Checkout the branch with the change we want to revert.
940 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span> 940 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span>
941 Branch drover_9999 set up to track remote ref refs/branch-heads/9999. 941 Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
942 942
943 # Here's the commit we want to revert. 943 # Here's the commit we want to revert.
944 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span> 944 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
945 <span style="color: #e7e71c">commit 98d544a18e19bb80be9d4a8094efda8ab1d2534b</sp an> 945 <span style="color: #e7e71c">commit d281ba6029d6bff1368a5885be8e2c638e1bfe73</sp an>
946 Author: some.committer &lt;some.committer@chromium.org&gt; 946 Author: some.committer &lt;some.committer@chromium.org&gt;
947 Date: Thu Apr 10 08:54:46 2014 +0000 947 Date: Thu Apr 10 08:54:46 2014 +0000
948 948
949 This change is horribly broken. 949 This change is horribly broken.
950 950
951 # Now do the revert. 951 # Now do the revert.
952 <span style="font-weight: bold; color: #ffffff">$ git revert 98d544a18e19bb80be9 d4a8094efda8ab1d2534b</span> 952 <span style="font-weight: bold; color: #ffffff">$ git revert d281ba6029d6bff1368 a5885be8e2c638e1bfe73</span>
953 953
954 # That reverted the change and committed the revert. 954 # That reverted the change and committed the revert.
955 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span> 955 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
956 <span style="color: #e7e71c">commit 0fc5e9101886dcb1aebbb9434d0df9341f0dedfe</sp an> 956 <span style="color: #e7e71c">commit 7eb05d0f8e79ef563684500dc38d0dee069f7dc6</sp an>
957 Author: you &lt;you@chromium.org&gt; 957 Author: you &lt;you@chromium.org&gt;
958 Date: Thu Apr 10 09:11:36 2014 +0000 958 Date: Thu Apr 10 09:11:36 2014 +0000
959 959
960 Revert "This change is horribly broken." 960 Revert "This change is horribly broken."
961 961
962 This reverts commit 98d544a18e19bb80be9d4a8094efda8ab1d2534b. 962 This reverts commit d281ba6029d6bff1368a5885be8e2c638e1bfe73.
963 963
964 # As with old drover, reverts are generally OK to commit without LGTM. 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.committe r@chromium.org --send-mail</span> 965 <span style="font-weight: bold; color: #ffffff">$ git cl upload -r some.committe r@chromium.org --send-mail</span>
966 <span style="font-weight: bold; color: #ffffff">$ git cl land --bypass-hooks</sp an> 966 <span style="font-weight: bold; color: #ffffff">$ git cl land --bypass-hooks</sp an>
967 Using 50% similarity for rename/copy detection. Override with --similarity.
967 </code></pre></div></div><p><div class="paragraph"></p></div> 968 </code></pre></div></div><p><div class="paragraph"></p></div>
968 </div> 969 </div>
969 <div class="sect3"> 970 <div class="sect3">
970 <h4 id="_manual_merge_example">Manual Merge Example</h4> 971 <h4 id="_manual_merge_example">Manual Merge Example</h4>
971 <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. 972 <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.
972 <span style="font-weight: bold; color: #ffffff">$ git fetch</span> 973 <span style="font-weight: bold; color: #ffffff">$ git fetch</span>
973 974
974 # Here's a commit (from some.committer) that we want to 'drover'. 975 # Here's a commit (from some.committer) that we want to 'drover'.
975 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span> 976 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>
976 <span style="color: #e7e71c">commit b27fff7b167964750303f60222e79f3932f438e0</sp an> 977 <span style="color: #e7e71c">commit b9199aa1ab7d60a1e127de8c46c0983d13f2c422</sp an>
977 Author: some.committer &lt;some.committer@chromium.org&gt; 978 Author: some.committer &lt;some.committer@chromium.org&gt;
978 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 979 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
979 Commit: some.committer &lt;some.committer@chromium.org&gt; 980 Commit: some.committer &lt;some.committer@chromium.org&gt;
980 CommitDate: Thu Apr 10 08:54:46 2014 +0000 981 CommitDate: Thu Apr 10 08:54:46 2014 +0000
981 982
982 This change needs to go to branch 9999 983 This change needs to go to branch 9999
983 984
984 # Checkout the branch we want to 'drover' to. 985 # Checkout the branch we want to 'drover' to.
985 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span> 986 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span>
986 Branch drover_9999 set up to track remote ref refs/branch-heads/9999. 987 Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
987 988
988 # Now do the 'drover'. 989 # Now do the 'drover'.
989 # IMPORTANT!!! Do Not leave off the '-x' flag 990 # IMPORTANT!!! Do Not leave off the '-x' flag
990 <span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x b27fff7b167 964750303f60222e79f3932f438e0</span> 991 <span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x b9199aa1ab7 d60a1e127de8c46c0983d13f2c422</span>
991 [drover_9999 bd8dc1c] This change needs to go to branch 9999 992 [drover_9999 729161e] This change needs to go to branch 9999
992 Author: some.committer &lt;some.committer@chromium.org&gt; 993 Author: some.committer &lt;some.committer@chromium.org&gt;
993 Date: Thu Apr 10 08:54:46 2014 +0000 994 Date: Thu Apr 10 08:54:46 2014 +0000
994 1 file changed, 1 insertion(+) 995 1 file changed, 1 insertion(+)
995 create mode 100644 modified_file 996 create mode 100644 modified_file
996 997
997 # That took the code authored by some.committer and committed it to 998 # That took the code authored by some.committer and committed it to
998 # the branch by the person who drovered it (i.e. you). 999 # the branch by the person who drovered it (i.e. you).
999 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span> 1000 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>
1000 <span style="color: #e7e71c">commit bd8dc1c0678913e36b2b06855810803a2e0ab906</sp an> 1001 <span style="color: #e7e71c">commit 729161e36af15142cdf591021de71e70e0db1ea2</sp an>
1001 Author: some.committer &lt;some.committer@chromium.org&gt; 1002 Author: some.committer &lt;some.committer@chromium.org&gt;
1002 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 1003 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
1003 Commit: you &lt;you@chromium.org&gt; 1004 Commit: you &lt;you@chromium.org&gt;
1004 CommitDate: Thu Apr 10 09:11:36 2014 +0000 1005 CommitDate: Thu Apr 10 09:11:36 2014 +0000
1005 1006
1006 This change needs to go to branch 9999 1007 This change needs to go to branch 9999
1007 1008
1008 (cherry picked from commit b27fff7b167964750303f60222e79f3932f438e0) 1009 (cherry picked from commit b9199aa1ab7d60a1e127de8c46c0983d13f2c422)
1009 1010
1010 # Looks good. Ship it! 1011 # Looks good. Ship it!
1011 <span style="font-weight: bold; color: #ffffff">$ git cl upload</span> 1012 <span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
1012 # Wait for LGTM or TBR it. 1013 # Wait for LGTM or TBR it.
1013 <span style="font-weight: bold; color: #ffffff">$ git cl land</span> 1014 <span style="font-weight: bold; color: #ffffff">$ git cl land</span>
1015 Using 50% similarity for rename/copy detection. Override with --similarity.
1014 # Or skip the LGTM/TBR and just 'git cl land --bypass-hooks' 1016 # Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'
1015 </code></pre></div></div><p><div class="paragraph"></p></div> 1017 </code></pre></div></div><p><div class="paragraph"></p></div>
1016 </div> 1018 </div>
1017 </div> 1019 </div>
1018 </div> 1020 </div>
1019 </div> 1021 </div>
1020 <div class="sect1"> 1022 <div class="sect1">
1021 <h2 id="_see_also">SEE ALSO</h2> 1023 <h2 id="_see_also">SEE ALSO</h2>
1022 <div class="sectionbody"> 1024 <div class="sectionbody">
1023 <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> 1025 <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>
1024 </div> 1026 </div>
1025 </div> 1027 </div>
1026 <div class="sect1"> 1028 <div class="sect1">
1027 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 1029 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
1028 <div class="sectionbody"> 1030 <div class="sectionbody">
1029 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to 1031 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to
1030 assist with the development of chromium and related projects. Download the tools 1032 assist with the development of chromium and related projects. Download the tools
1031 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 1033 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here </a>.</p></div>
1032 </div> 1034 </div>
1033 </div> 1035 </div>
1034 </div> 1036 </div>
1035 <div id="footnotes"><hr /></div> 1037 <div id="footnotes"><hr /></div>
1036 <div id="footer"> 1038 <div id="footer">
1037 <div id="footer-text"> 1039 <div id="footer-text">
1038 Last updated 2015-10-20 18:00:26 AEDT 1040 Last updated 2016-07-21 10:09:00 PDT
1039 </div> 1041 </div>
1040 </div> 1042 </div>
1041 </body> 1043 </body>
1042 </html> 1044 </html>
OLDNEW
« no previous file with comments | « man/html/git-cherry-pick-upload.html ('k') | man/html/git-footers.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698