aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
main
chrome/4147
chrome/3987
chrome/3865
chrome/3904
infra/config
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '49dfcde0f1'
${ noResults }
depot_tools/tests
History
primiano@chromium.org 49dfcde0f1 Use three-way merge when applying Git patches. 
After switching to a pure git workflow, most of the patchset we upload
to rietveld have git metadata. Apparently, however, the scripts here in
depot tools, which are used by the CQ and trybots, are ignoring that
and applying patches without taking advantage of git metadata.
In practice this causes people to rebase and reupload patches more than
necessary, even in the cases when it could be handled automatically by
means of a three way merge.
This change updates the GitCheckout class of depot_tools to use that.

BUG=416003

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@292087 0039d316-1c4b-4281-b951-d872f2087c98
 		11 years ago
..
gstools Scripts to download files from google storage based on sha1 sums 12 years ago
subversion_config
…
abandon.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
basic.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
breakpad_unittest.py Make sure that direct call to SendStack() doesn't send a stack trace for non googler 14 years ago
checkout_test.py Use three-way merge when applying Git patches. 11 years ago
download_from_google_storage_unittests.py Adds --auto_platform to download_from_google_storage. 11 years ago
fix_encoding_test.py
…
gcl_unittest.py Add the patchset id to the manual commit messages 11 years ago
gclient_scm_test.py Use CheckCallAndFilterAndHeader for git commands. 11 years ago
gclient_smoketest.py Reland: Add --no-history option to fetch and gclient for shallow clones. 11 years ago
gclient_test.py Convert recursedeps test syntax to list literal. 11 years ago
gclient_utils_test.py Make it possible to refer to github-style URLs. 11 years ago
git_cl_test.py Stop git cl using CQ_TRYBOTS. 11 years ago
git_common_test.py Skip tracking status in map-branches when -v flag is not supplied. 11 years ago
git_footers_test.py Added git footers tool to parse conventional metadata from git commits 11 years ago
git_number_test.py Add a family of git-commands to assist with the management of multiple CLs/branches. 11 years ago
git_rebase_update_test.py Added hyphen-only options 11 years ago
hooks.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
owners.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
owners_finder_test.py An interactive tool to help find owners covering current change list. 12 years ago
owners_unittest.py Add a way to require approval from owners other than the author. 12 years ago
patch.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
patch_test.py Fix applying svn:executable on Windows. 13 years ago
post-dcommit-hook-test.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
presubmit_unittest.py Add exception for long url(..) lines in css files in presubmit_canned_checks.CheckLongLines 11 years ago
push-basic.sh Removed git cl push command 11 years ago
push-from-logs.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
rename.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
rietveld_test.py Incorrect SSLError attribute. 11 years ago
sample_pre_commit_hook
…
save-description-on-failure.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
scm_unittest.py Fix gclient branch ref mangling and allow --force branch switches. 11 years ago
submit-from-new-dir.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
submodule-merge-test.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
subprocess2_test.py Fix many (but not all[1]) depot_tools tests on Windows. 12 years ago
test-lib.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
trychange_unittest.py trychange.py: Gerrit protocol 11 years ago
upload-local-tracking-branch.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
upload-stale.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
upload_to_google_storage_unittests.py Add no_auth flag to skip auth checking for buckets that don't require it. Also fix tests 12 years ago
upstream.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago
watchlists_unittest.py
…