Support merging with conflicts with git-drover.

man/html/git-drover.html

Index: man/html/git-drover.html
diff --git a/man/html/git-drover.html b/man/html/git-drover.html
index 3171d2aeb4f390d213eea0b146612a2cc2d9ffc1..ebe03457fa66a913e55e5d43f8916926f5440759 100644
--- a/man/html/git-drover.html
+++ b/man/html/git-drover.html
@@ -755,7 +755,9 @@ git-drover(1) Manual Page
 <h2 id="_synopsis">SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<pre class="content"><em>git drover</em> --branch &lt;branch&gt; --cherry-pick &lt;commit&gt;
+<pre class="content"><em>git drover</em> --branch &lt;branch&gt;
+           (--cherry-pick &lt;change&gt; | --continue [path_to_workdir] |
+            --abort [path_to_workdir])
            [--parent_checkout &lt;path-to-existing-checkout&gt;]
            [--verbose] [--dry-run]</pre>
 <div class="attribution">
@@ -767,8 +769,7 @@ git-drover(1) Manual Page
 <div class="sectionbody">
 <div class="paragraph"><p><code>git drover</code> applies a commit to a release branch. It creates a new workdir from
 an existing checkout to avoid downloading a new checkout without affecting the
-existing checkout. Creating a workdir requires symlinks so this does not work on
-Windows. See the EXAMPLE section for the equivalent sequence of commands to run.</p></div>
+existing checkout.</p></div>
 <div class="paragraph"><p><code>git drover</code> does not support reverts. See the EXAMPLE section for the
 equivalent sequence of commands to run.</p></div>
 </div>
@@ -794,6 +795,25 @@ equivalent sequence of commands to run.</p></div>
 </p>
 </dd>
 <dt class="hdlist1">
+--continue [path_to_workdir]
+</dt>
+<dd>
+<p>
+  Continue a cherry-pick that required manual resolution. The path to the drover
+  workdir is optional. If unspecified, the current directory is used.
+</p>
+</dd>
+<dt class="hdlist1">
+--abort [path_to_workdir]
+</dt>
+<dd>
+<p>
+  Abort a cherry-pick that required manual resolution and clean up its workdir.
+  The path to the drover workdir is optional. If unspecified, the current
+  directory is used.
+</p>
+</dd>
+<dt class="hdlist1">
 --parent_checkout
 </dt>
 <dd>
@@ -838,7 +858,37 @@ 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 8b79b7b2f7e6e728f9a3c7b385c72efc7c47244a</span>
+<span style="color: #e7e71c">commit f7448045de01b54914db8b902ca77fbbf42b3146</span>
+Author:     some.committer &lt;some.committer@chromium.org&gt;
+AuthorDate: Thu Apr 10 08:54:46 2014 +0000
+Commit:     some.committer &lt;some.committer@chromium.org&gt;
+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>
+Going to cherry-pick
+"""
+<span style="color: #e7e71c">commit f7448045de01b54914db8b902ca77fbbf42b3146</span>
+Author: some.committer &lt;some.committer@chromium.org&gt;
+Date:   Thu Apr 10 08:54:46 2014 +0000
+
+    This change needs to go to branch 9999
+"""
+to 9999. Continue (y/n)? y
+
+# A cl is uploaded to rietveld, where it can be reviewed before landing.
+
+About to land on 9999. Continue (y/n)? y
+# The cherry-pick cl is landed on the branch 9999.
+</code></pre></div></div><p><div class="paragraph"></p></div>
+</div>
+<div class="sect3">
+<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>
 Author:     some.committer &lt;some.committer@chromium.org&gt;
 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 Commit:     some.committer &lt;some.committer@chromium.org&gt;
@@ -847,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 8b79b7b2f7e6e728f9a3c7b385c72efc7c47244a</span>
+<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick ca8e437616d853cb10008a252b54cfed928f157c</span>
 Going to cherry-pick
 """
-<span style="color: #e7e71c">commit 8b79b7b2f7e6e728f9a3c7b385c72efc7c47244a</span>
+<span style="color: #e7e71c">commit ca8e437616d853cb10008a252b54cfed928f157c</span>
 Author: some.committer &lt;some.committer@chromium.org&gt;
 Date:   Thu Apr 10 08:54:46 2014 +0000
 
@@ -858,6 +908,23 @@ Date:   Thu Apr 10 08:54:46 2014 +0000
 """
 to 9999. Continue (y/n)? y
 
+Error: Patch failed to apply.
+
+A workdir for this cherry-pick has been created in
+  /tmp/drover_9999
+
+To continue, resolve the conflicts there and run
+  git drover --continue /tmp/drover_9999
+
+To abort this cherry-pick run
+  git drover --abort /tmp/drover_9999
+
+<span style="font-weight: bold; color: #ffffff">$ pushd /tmp/drover_9999</span>
+# Manually resolve conflicts.
+<span style="font-weight: bold; color: #ffffff">$ git add path/to/file_with_conflicts</span>
+<span style="font-weight: bold; color: #ffffff">$ popd</span>
+<span style="font-weight: bold; color: #ffffff">$ git drover --continue /tmp/drover_9999</span>
+
 # A cl is uploaded to rietveld, where it can be reviewed before landing.
 
 About to land on 9999. Continue (y/n)? y
@@ -875,24 +942,24 @@ 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 33b0e9164d4564eb8a4b4e5b951bba6edeeecacb</span>
+<span style="color: #e7e71c">commit 98d544a18e19bb80be9d4a8094efda8ab1d2534b</span>
 Author: some.committer &lt;some.committer@chromium.org&gt;
 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 33b0e9164d4564eb8a4b4e5b951bba6edeeecacb</span>
+<span style="font-weight: bold; color: #ffffff">$ git revert 98d544a18e19bb80be9d4a8094efda8ab1d2534b</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 8a2d2bb98b9cfc9260a9bc86da1eec2a43f43f8b</span>
+<span style="color: #e7e71c">commit 0fc5e9101886dcb1aebbb9434d0df9341f0dedfe</span>
 Author: you &lt;you@chromium.org&gt;
 Date:   Thu Apr 10 09:11:36 2014 +0000
 
     Revert "This change is horribly broken."
 
-    This reverts commit 33b0e9164d4564eb8a4b4e5b951bba6edeeecacb.
+    This reverts commit 98d544a18e19bb80be9d4a8094efda8ab1d2534b.
 
 # 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>
@@ -906,7 +973,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 537f446fa3d5e41acab017bb0b082fbd0c9eb043</span>
+<span style="color: #e7e71c">commit b27fff7b167964750303f60222e79f3932f438e0</span>
 Author:     some.committer &lt;some.committer@chromium.org&gt;
 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 Commit:     some.committer &lt;some.committer@chromium.org&gt;
@@ -920,8 +987,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 537f446fa3d5e41acab017bb0b082fbd0c9eb043</span>
-[drover_9999 b468abc] This change needs to go to branch 9999
+<span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x b27fff7b167964750303f60222e79f3932f438e0</span>
+[drover_9999 bd8dc1c] This change needs to go to branch 9999
  Author: some.committer &lt;some.committer@chromium.org&gt;
  Date: Thu Apr 10 08:54:46 2014 +0000
  1 file changed, 1 insertion(+)
@@ -930,7 +997,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 b468abc42ddd4fd9aecc48c3eda172265306d2b4</span>
+<span style="color: #e7e71c">commit bd8dc1c0678913e36b2b06855810803a2e0ab906</span>
 Author:     some.committer &lt;some.committer@chromium.org&gt;
 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 Commit:     you &lt;you@chromium.org&gt;
@@ -938,7 +1005,7 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000
 
     This change needs to go to branch 9999
 
-    (cherry picked from commit 537f446fa3d5e41acab017bb0b082fbd0c9eb043)
+    (cherry picked from commit b27fff7b167964750303f60222e79f3932f438e0)
 
 # Looks good. Ship it!
 <span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
@@ -968,7 +1035,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-09-23 11:11:58 AEST
+Last updated 2015-10-20 18:00:26 AEDT
 </div>
 </div>
 </body>