Support merging with conflicts with git-drover.

Support merging with conflicts with git-drover.

Currently, git-drover gives up and cleans up if the cherry-pick fails.
This change allows the user to manually resolve conflicts when using
git-drover.

BUG=404755
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=297429

[Sam McNally, 2015-10-12 08:34:26]

Patchset #1 (id:1) has been deleted

[Sam McNally, 2015-10-12 08:34:38]

Patchset #1 (id:20001) has been deleted

[Sam McNally, 2015-10-20 05:45:33]

Patchset #1 (id:40001) has been deleted

[Sam McNally, 2015-10-20 05:45:39]

Patchset #1 (id:60001) has been deleted

[Sam McNally, 2015-10-20 05:45:45]

Patchset #1 (id:80001) has been deleted

[Sam McNally, 2015-10-20 05:45:53]

Patchset #1 (id:100001) has been deleted

[Sam McNally, 2015-10-20 05:46:00]

Patchset #1 (id:120001) has been deleted

[Sam McNally, 2015-10-20 05:56:50]

Patchset #2 (id:160001) has been deleted

[Sam McNally, 2015-10-20 05:57:20]

Patchset #1 (id:140001) has been deleted

[Sam McNally, 2015-10-20 06:52:54]

Patchset #1 (id:180001) has been deleted

[Sam McNally, 2015-10-20 07:02:36]

Patchset #1 (id:200001) has been deleted

[Sam McNally, 2015-10-20 07:09:56]

sammc@chromium.org changed reviewers:
+ iannucci@chromium.org

[Sam McNally, 2015-10-29 00:05:57]

ping

[iannucci, 2015-11-02 20:37:58]

lgtm

https://chromiumcodereview.appspot.com/1397313002/diff/220001/git_drover.py
File git_drover.py (right):

https://chromiumcodereview.appspot.com/1397313002/diff/220001/git_drover.py#n...
git_drover.py:98: drover._cleanup()
will this work if they're cd'd into the directory?

https://chromiumcodereview.appspot.com/1397313002/diff/220001/git_drover.py#n...
git_drover.py:111: logging.getLogger().setLevel(logging.DEBUG)
weird, but I see what you did there. Would be nice if this type of functionality
(resuming original CLI params) had it's own function instead of be inlined here.
I suspect it'll get extended in-line and will become quite messy.

[Sam McNally, 2015-11-03 00:53:45]

https://codereview.chromium.org/1397313002/diff/220001/git_drover.py
File git_drover.py (right):

https://codereview.chromium.org/1397313002/diff/220001/git_drover.py#newcode98
git_drover.py:98: drover._cleanup()
On 2015/11/02 20:37:58, iannucci wrote:
> will this work if they're cd'd into the directory?

Yes, except on Windows. On Windows it reports it to the user and asks them to
manually delete it. It seems to delete the contents at least, so it cleans up
most of the way.

https://codereview.chromium.org/1397313002/diff/220001/git_drover.py#newcode111
git_drover.py:111: logging.getLogger().setLevel(logging.DEBUG)
On 2015/11/02 20:37:58, iannucci wrote:
> weird, but I see what you did there. Would be nice if this type of
functionality
> (resuming original CLI params) had it's own function instead of be inlined
here.
> I suspect it'll get extended in-line and will become quite messy.

Done.

[Sam McNally, 2015-11-03 00:55:43]

The CQ bit was checked by sammc@chromium.org

[Sam McNally, 2015-11-03 00:55:44]

The patchset sent to the CQ was uploaded after l-g-t-m from
iannucci@chromium.org
Link to the patchset: https://codereview.chromium.org/1397313002/#ps240001
(title: " ")

[commit-bot: I haz the power, 2015-11-03 00:55:52]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1397313002/240001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1397313002/240001

[commit-bot: I haz the power, 2015-11-03 00:57:50]

Committed patchset #2 (id:240001) as
http://src.chromium.org/viewvc/chrome?view=rev&revision=297429