@ -858,7 +858,7 @@ at least once to fetch the branches.</p></div>
< h4 id = "_merge_example" > Merge Example< / h4 >
< 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'.
< span style = "font-weight: bold; color: #ffffff" > $ git log -n 1 --pretty=fuller< / span >
< span style = "color: #e7e71c" > commit f7448045de01b54914db8b902ca77fbbf42b3146 < / span >
< span style = "color: #e7e71c" > commit f1b2947cd99ad36614e71a51a925a6dae060fecd < / span >
Author: some.committer < some.committer@chromium.org>
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: some.committer < some.committer@chromium.org>
@ -867,10 +867,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
This change needs to go to branch 9999
# Now do the 'drover'.
< span style = "font-weight: bold; color: #ffffff" > $ git drover --branch 9999 --cherry-pick f7448045de01b54914db8b902ca77fbbf42b3146 < / span >
< span style = "font-weight: bold; color: #ffffff" > $ git drover --branch 9999 --cherry-pick f1b2947cd99ad36614e71a51a925a6dae060fecd < / span >
Going to cherry-pick
"""
< span style = "color: #e7e71c" > commit f7448045de01b54914db8b902ca77fbbf42b3146 < / span >
< span style = "color: #e7e71c" > commit f1b2947cd99ad36614e71a51a925a6dae060fecd < / span >
Author: some.committer < some.committer@chromium.org>
Date: Thu Apr 10 08:54:46 2014 +0000
@ -888,7 +888,7 @@ About to land on 9999. Continue (y/n)? y
< h4 id = "_merge_with_conflicts_example" > Merge with Conflicts Example< / h4 >
< 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'.
< span style = "font-weight: bold; color: #ffffff" > $ git log -n 1 --pretty=fuller< / span >
< span style = "color: #e7e71c" > commit ca8e437616d853cb10008a252b54cfed928f157c < / span >
< span style = "color: #e7e71c" > commit 78d5e1beb49c2bfa0369a2712dd1b4a502805a77 < / span >
Author: some.committer < some.committer@chromium.org>
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: some.committer < some.committer@chromium.org>
@ -897,10 +897,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
This change needs to go to branch 9999
# Now do the 'drover'.
< span style = "font-weight: bold; color: #ffffff" > $ git drover --branch 9999 --cherry-pick ca8e437616d853cb10008a252b54cfed928f157c < / span >
< span style = "font-weight: bold; color: #ffffff" > $ git drover --branch 9999 --cherry-pick 78d5e1beb49c2bfa0369a2712dd1b4a502805a77 < / span >
Going to cherry-pick
"""
< span style = "color: #e7e71c" > commit ca8e437616d853cb10008a252b54cfed928f157c < / span >
< span style = "color: #e7e71c" > commit 78d5e1beb49c2bfa0369a2712dd1b4a502805a77 < / span >
Author: some.committer < some.committer@chromium.org>
Date: Thu Apr 10 08:54:46 2014 +0000
@ -942,28 +942,29 @@ Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
# Here's the commit we want to revert.
< span style = "font-weight: bold; color: #ffffff" > $ git log -n 1< / span >
< span style = "color: #e7e71c" > commit 98d544a18e19bb80be9d4a8094efda8ab1d2534b < / span >
< span style = "color: #e7e71c" > commit d281ba6029d6bff1368a5885be8e2c638e1bfe73 < / span >
Author: some.committer < some.committer@chromium.org>
Date: Thu Apr 10 08:54:46 2014 +0000
This change is horribly broken.
# Now do the revert.
< span style = "font-weight: bold; color: #ffffff" > $ git revert 98d544a18e19bb80be9d4a8094efda8ab1d2534b < / span >
< span style = "font-weight: bold; color: #ffffff" > $ git revert d281ba6029d6bff1368a5885be8e2c638e1bfe73 < / span >
# That reverted the change and committed the revert.
< span style = "font-weight: bold; color: #ffffff" > $ git log -n 1< / span >
< span style = "color: #e7e71c" > commit 0fc5e9101886dcb1aebbb9434d0df9341f0dedfe < / span >
< span style = "color: #e7e71c" > commit 7eb05d0f8e79ef563684500dc38d0dee069f7dc6 < / span >
Author: you < you@chromium.org>
Date: Thu Apr 10 09:11:36 2014 +0000
Revert "This change is horribly broken."
This reverts commit 98d544a18e19bb80be9d4a8094efda8ab1d2534b .
This reverts commit d281ba6029d6bff1368a5885be8e2c638e1bfe73 .
# As with old drover, reverts are generally OK to commit without LGTM.
< span style = "font-weight: bold; color: #ffffff" > $ git cl upload -r some.committer@chromium.org --send-mail< / span >
< span style = "font-weight: bold; color: #ffffff" > $ git cl land --bypass-hooks< / span >
Using 50% similarity for rename/copy detection. Override with --similarity.
< / code > < / pre > < / div > < / div > < p > < div class = "paragraph" > < / p > < / div >
< / div >
< div class = "sect3" >
@ -973,7 +974,7 @@ Date: Thu Apr 10 09:11:36 2014 +0000
# Here's a commit (from some.committer) that we want to 'drover'.
< span style = "font-weight: bold; color: #ffffff" > $ git log -n 1 --pretty=fuller< / span >
< span style = "color: #e7e71c" > commit b27fff7b167964750303f60222e79f3932f438e0 < / span >
< span style = "color: #e7e71c" > commit b9199aa1ab7d60a1e127de8c46c0983d13f2c422 < / span >
Author: some.committer < some.committer@chromium.org>
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: some.committer < some.committer@chromium.org>
@ -987,8 +988,8 @@ Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
# Now do the 'drover'.
# IMPORTANT!!! Do Not leave off the '-x' flag
< span style = "font-weight: bold; color: #ffffff" > $ git cherry-pick -x b27fff7b167964750303f60222e79f3932f438e0 < / span >
[drover_9999 bd8dc1c ] This change needs to go to branch 9999
< span style = "font-weight: bold; color: #ffffff" > $ git cherry-pick -x b9199aa1ab7d60a1e127de8c46c0983d13f2c422 < / span >
[drover_9999 729161e ] This change needs to go to branch 9999
Author: some.committer < some.committer@chromium.org>
Date: Thu Apr 10 08:54:46 2014 +0000
1 file changed, 1 insertion(+)
@ -997,7 +998,7 @@ Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
# That took the code authored by some.committer and committed it to
# the branch by the person who drovered it (i.e. you).
< span style = "font-weight: bold; color: #ffffff" > $ git log -n 1 --pretty=fuller< / span >
< span style = "color: #e7e71c" > commit bd8dc1c0678913e36b2b06855810803a2e0ab906 < / span >
< span style = "color: #e7e71c" > commit 729161e36af15142cdf591021de71e70e0db1ea2 < / span >
Author: some.committer < some.committer@chromium.org>
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
Commit: you < you@chromium.org>
@ -1005,12 +1006,13 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000
This change needs to go to branch 9999
(cherry picked from commit b27fff7b167964750303f60222e79f3932f438e0 )
(cherry picked from commit b9199aa1ab7d60a1e127de8c46c0983d13f2c422 )
# Looks good. Ship it!
< span style = "font-weight: bold; color: #ffffff" > $ git cl upload< / span >
# Wait for LGTM or TBR it.
< span style = "font-weight: bold; color: #ffffff" > $ git cl land< / span >
Using 50% similarity for rename/copy detection. Override with --similarity.
# Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'
< / code > < / pre > < / div > < / div > < p > < div class = "paragraph" > < / p > < / div >
< / div >
@ -1028,14 +1030,14 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000
< div class = "sectionbody" >
< div class = "paragraph" > < p > Part of the chromium < a href = "depot_tools.html" > depot_tools(7)< / a > suite. These tools are meant to
assist with the development of chromium and related projects. Download the tools
from < a href = "https://chromium.googlesource.com/chromium/tools/depot_tools .git "> here< / a > .< / p > < / div >
from < a href = "https://chromium.googlesource.com/chromium/tools/depot_tools "> here< / a > .< / p > < / div >
< / div >
< / div >
< / div >
< div id = "footnotes" > < hr / > < / div >
< div id = "footer" >
< div id = "footer-text" >
Last updated 2015-10-20 18:00:26 AE DT
Last updated 2016-07-21 10:09:00 P DT
< / div >
< / div >
< / body >