Files · 8990189aed6172a4f5add0ba89656ff281603f6a · Linshizhi / Chromium_Depot_tools

Support merging with conflicts with git-drover. · 8990189a

sammc@chromium.org authored Nov 03, 2015

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

Review URL: https://codereview.chromium.org/1397313002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297429 0039d316-1c4b-4281-b951-d872f2087c98

8990189a

Name	Last commit	Last update
bootstrap		Loading commit data...
git-templates		Loading commit data...
git_utils		Loading commit data...
infra		Loading commit data...
luci_hacks		Loading commit data...
man		Loading commit data...
recipes		Loading commit data...
support		Loading commit data...
testing_support		Loading commit data...
tests		Loading commit data...
third_party		Loading commit data...
win_toolchain		Loading commit data...
zsh-goodies		Loading commit data...
.gitignore		Loading commit data...
.style.yapf		Loading commit data...
LICENSE		Loading commit data...
OWNERS		Loading commit data...
PRESUBMIT.py		Loading commit data...
README		Loading commit data...
README.codereview		Loading commit data...
README.gclient		Loading commit data...
README.git-cl		Loading commit data...
README.testing		Loading commit data...
WATCHLISTS		Loading commit data...
annotated_gclient.py		Loading commit data...
apply_issue		Loading commit data...
apply_issue.bat		Loading commit data...
apply_issue.py		Loading commit data...
auth.py		Loading commit data...
breakpad.py		Loading commit data...
buildbucket.py		Loading commit data...
cbuildbot		Loading commit data...
checkout.py		Loading commit data...
chrome-update-create-task.bat		Loading commit data...
chrome-update.bat		Loading commit data...
chrome-update.py		Loading commit data...
chrome_set_ver		Loading commit data...
cit		Loading commit data...
cit.bat		Loading commit data...
cit.py		Loading commit data...
clang-format		Loading commit data...
clang-format.bat		Loading commit data...
clang_format.py		Loading commit data...
codereview.settings		Loading commit data...
commit_queue		Loading commit data...
commit_queue.bat		Loading commit data...
commit_queue.py		Loading commit data...
cpplint.bat		Loading commit data...
cpplint.py		Loading commit data...
cpplint_chromium.py		Loading commit data...
create-chromium-git-src		Loading commit data...
create-ntfs-junction.c		Loading commit data...
create-ntfs-junction.exe		Loading commit data...
cros		Loading commit data...
cros_sdk		Loading commit data...
dart_format.py		Loading commit data...
depot-tools-auth		Loading commit data...
depot-tools-auth.bat		Loading commit data...
depot-tools-auth.py		Loading commit data...
download_from_google_storage		Loading commit data...
download_from_google_storage.bat		Loading commit data...
download_from_google_storage.py		Loading commit data...
drover		Loading commit data...
drover.bat		Loading commit data...
drover.py		Loading commit data...
fetch		Loading commit data...
fetch.bat		Loading commit data...
fetch.py		Loading commit data...
fix_encoding.py		Loading commit data...
gcl		Loading commit data...
gcl.bat		Loading commit data...
gcl.py		Loading commit data...
gclient		Loading commit data...
gclient-new-workdir.py		Loading commit data...
gclient.bat		Loading commit data...
gclient.py		Loading commit data...
gclient_completion.sh		Loading commit data...
gclient_scm.py		Loading commit data...
gclient_utils.py		Loading commit data...
gerrit_util.py		Loading commit data...
git-auto-svn		Loading commit data...
git-cache		Loading commit data...
git-cherry-pick-upload		Loading commit data...
git-cl		Loading commit data...
git-cl-upload-hook		Loading commit data...
git-crrev-parse		Loading commit data...
git-crsync		Loading commit data...
git-crup		Loading commit data...
git-drover		Loading commit data...
git-find-releases		Loading commit data...
git-footers		Loading commit data...
git-freeze		Loading commit data...
git-gs		Loading commit data...
git-lkgr		Loading commit data...
git-map		Loading commit data...
git-map-branches		Loading commit data...
git-mark-merge-base		Loading commit data...
git-nav-downstream		Loading commit data...
git-nav-upstream		Loading commit data...
git-new-branch		Loading commit data...
git-number		Loading commit data...
git-rebase-update		Loading commit data...
git-rename-branch		Loading commit data...
git-reparent-branch		Loading commit data...
git-retry		Loading commit data...
git-runhooks		Loading commit data...
git-squash-branch		Loading commit data...
git-thaw		Loading commit data...
git-try		Loading commit data...
git-upstream-diff		Loading commit data...
git_auto_svn.py		Loading commit data...
git_cache.py		Loading commit data...
git_cherry_pick_upload.py		Loading commit data...
git_cl.py		Loading commit data...
git_common.py		Loading commit data...
git_drover.py		Loading commit data...
git_find_releases.py		Loading commit data...
git_footers.py		Loading commit data...
git_freezer.py		Loading commit data...
git_map.py		Loading commit data...
git_map_branches.py		Loading commit data...
git_mark_merge_base.py		Loading commit data...
git_nav_downstream.py		Loading commit data...
git_new_branch.py		Loading commit data...
git_number.py		Loading commit data...
git_rebase_update.py		Loading commit data...
git_rename_branch.py		Loading commit data...
git_reparent_branch.py		Loading commit data...
git_retry.py		Loading commit data...
git_squash_branch.py		Loading commit data...
git_try.py		Loading commit data...
git_upstream_diff.py		Loading commit data...
gn		Loading commit data...
gn.bat		Loading commit data...
gn.py		Loading commit data...
gsutil.py		Loading commit data...
hammer		Loading commit data...
hammer.bat		Loading commit data...
my_activity.py		Loading commit data...
my_reviews.py		Loading commit data...
ninja		Loading commit data...
ninja-linux32		Loading commit data...
ninja-linux64		Loading commit data...
ninja-mac		Loading commit data...
ninja.exe		Loading commit data...
owners.py		Loading commit data...
owners_finder.py		Loading commit data...
patch.py		Loading commit data...
presubmit_canned_checks.py		Loading commit data...
presubmit_support.py		Loading commit data...
profile.xml		Loading commit data...
pylint		Loading commit data...
pylint.py		Loading commit data...
pylintrc		Loading commit data...
python_runner.sh		Loading commit data...
repo		Loading commit data...
rietveld.py		Loading commit data...
roll-dep		Loading commit data...
roll-dep-svn		Loading commit data...
roll-dep-svn.bat		Loading commit data...
roll-dep.bat		Loading commit data...
roll_dep.py		Loading commit data...
roll_dep_svn.py		Loading commit data...
scm.py		Loading commit data...
subcommand.py		Loading commit data...
subprocess2.py		Loading commit data...
trychange.py		Loading commit data...
update_depot_tools		Loading commit data...
update_depot_tools.bat		Loading commit data...
upload_to_google_storage.py		Loading commit data...
watchlists.py		Loading commit data...
weekly		Loading commit data...
wtf		Loading commit data...

README