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.

John Budorick 2c984a03ca Revert "Reland "gclient_scm: Use cherry-picking instead of rebasing."" ... This reverts commit f9afc77f28. Reason for revert: https://bugs.chromium.org/p/chromium/issues/detail?id=864301#c10 Original change's description: > Reland "gclient_scm: Use cherry-picking instead of rebasing." > > The failures were caused by: > 1 - When one change (call it #2) has been uploaded on top of another (#1), > and (#1) has already landed, git cherry-pick complains that the range > '<merge-base>..<change #2>' contains empty commits, since the contents > of (#1) are already present in the tree. > 2 - We did not abort the cherry-picking when 'git cherry-pick' failed, > so a failure made all further CLs in that bot fail. > > This CL fixes it and prevents further regressions. > > Original change's description: > > gclient_scm: Use cherry-picking instead of rebasing. > > > > Currently gclient might include extra commits when applying patches. > > For example, in this case we checkout |patch| and rebase it on top of |base|, > > thus including an |extra commit| that we shouldn't. > > > > o master > > | > > . o patch > > |/ > > o extra commit > > | > > o base (what gclient synced src at) > > > > This change uses the merge-base between |patch| and |master| to cherry-pick only > > the changes belonging to the patch. > > > > Bug: 850812 > > Change-Id: I138192f96bc62b1bb19b0e1ad952c8f8c67631c4 > > Reviewed-on: https://chromium-review.googlesource.com/1137052 > > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> > > Reviewed-by: Aaron Gable <agable@chromium.org> > > Bug: 850812 > Change-Id: I83f38d0a258df3f5cd89e277f0d648badff29a22 > Reviewed-on: https://chromium-review.googlesource.com/1139554 > Reviewed-by: Aaron Gable <agable@chromium.org> > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> TBR=agable@chromium.org,ehmaldonado@chromium.org,jbudorick@chromium.org Change-Id: I2138757899abd6eb9bece2dac3a25676effafdf3 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 850812 Reviewed-on: https://chromium-review.googlesource.com/1142624 Reviewed-by: John Budorick <jbudorick@chromium.org> Commit-Queue: John Budorick <jbudorick@chromium.org>		7 years ago
..
gstools	…
auth_test.py	[auth] cache LUCI_CONTEXT local_auth parameters.	7 years ago
bot_update_coverage_test.py	Reland of "Wipe out shallow checkout support from bot_update."	7 years ago
checkout_test.py	Revert "Fix checkout.py issues when p.patchlevel > 1."	8 years ago
download_from_google_storage_unittest.py	download_from_google_storage: allow normal files with ..	7 years ago
fix_encoding_test.py	…
gclient_eval_unittest.py	Add a library for monitoring.	7 years ago
gclient_scm_test.py	Revert "Reland "gclient_scm: Use cherry-picking instead of rebasing.""	7 years ago
gclient_smoketest.py	gclient: run cipd ensure in paranoid mode.	7 years ago
gclient_test.py	Add support to gclient for skipping CIPD deps.	7 years ago
gclient_utils_test.py	gclient: Stop printing newline in front of "________ running hook"	8 years ago
git_cache_test.py	git_cache: Add tests for reset fetch config.	7 years ago
git_cl_creds_check_report.txt	…
git_cl_test.py	git cl: Do not set WIP when using no_squash.	7 years ago
git_common_test.py	git_test_utils: Fixed custom git metadata in git commit schemas.	7 years ago
git_dates_test.py	…
git_drover_test.py	Reland "Use core.quotePath=false when git is listing files"	7 years ago
git_footers_test.py	Let git_footers split final paragraphs in specific cases	7 years ago
git_hyper_blame_test.py	Update git_hyper_blame_test for git 2.16	7 years ago
git_number_test.py	…
git_rebase_update_test.py	…
gsutil_test.py	download_from_google_storage: Fix tests and rename	7 years ago
metrics_test.py	metrics: Fix countdown to metrics collection.	7 years ago
owners_finder_test.py	Skip files owned by reviewers when quering for missing owners.	7 years ago
owners_unittest.py	owners: Add support for comments at the end of the line.	7 years ago
patch_test.py	…
presubmit_unittest.py	Add gclient_utils to InputAPI export.	7 years ago
recipes_test.py	…
roll_dep_test.py	Add a library for monitoring.	7 years ago
scm_unittest.py	Revert "Reland "gclient_scm: Use cherry-picking instead of rebasing.""	7 years ago
subprocess2_test.py	…
upload_to_google_storage_unittest.py	tests: Use the right clean up method name for some test cases.	7 years ago
watchlists_unittest.py	…