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.

Andrii Shyshkalov 690d8d437b Revert "gclient_scm: Use cherry-picking instead of rebasing." ... This reverts commit c912114140. Reason for revert: broke patch application on infra/config https://crbug.com/853032 Original change's description: > gclient_scm: Use cherry-picking instead of rebasing. > > We have a problem when in this situation, 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 does merge-base between |patch| and |master|, and cherry-picks only the > changes belonging to the patch. > > Bug: 850812 > Change-Id: Id09ae1682e53b69ed49b2fb649310de6a6a8a29e > Reviewed-on: https://chromium-review.googlesource.com/1098228 > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> > Reviewed-by: Aaron Gable <agable@chromium.org> TBR=agable@chromium.org,ehmaldonado@chromium.org Change-Id: Ib3feeee2f44f5441713383f1dbf08db16fae4717 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 850812, 853032 Reviewed-on: https://chromium-review.googlesource.com/1101977 Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org> Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>		7 years ago
..
gstools	…
auth_test.py	[auth] cache LUCI_CONTEXT local_auth parameters.	7 years ago
bot_update_coverage_test.py	bot_update: Fix manifest creation.	7 years ago
checkout_test.py	…
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	Reland "Reland "Expand variables in gclient flattened output.""	7 years ago
gclient_scm_test.py	Revert "gclient_scm: Use cherry-picking instead of rebasing."	7 years ago
gclient_smoketest.py	gclient: Don't allow None URLs (except in .gclient files)	7 years ago
gclient_test.py	gclient: Don't allow None URLs (except in .gclient files)	7 years ago
gclient_utils_test.py	…
git_cache_test.py	…
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	…
git_footers_test.py	…
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	…
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	Remove more Rietveld support from presubmit	7 years ago
recipes_test.py	…
roll_dep_test.py	roll-dep: Add tests.	7 years ago
scm_unittest.py	…
subprocess2_test.py	…
upload_to_google_storage_unittest.py	…
watchlists_unittest.py	…