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
..
__init__.py	…
auto_stub.py	…
cipd	gclient: Add a test to make sure we're syncing CIPD dependencies.	8 years ago
cipd.bat	gclient: Add a test to make sure we're syncing CIPD dependencies.	8 years ago
coverage_utils.py	…
fake_cipd.py	gclient: Add a test to make sure we're syncing CIPD dependencies.	8 years ago
fake_repos.py	Revert "gclient_scm: Use cherry-picking instead of rebasing."	7 years ago
filesystem_mock.py	…
gerrit-init.sh	…
gerrit_test_case.py	Reland "Refactor ReadHttpResponse to be error-friendlier"	9 years ago
git_test_utils.py	git_test_utils: Fixed custom git metadata in git commit schemas.	8 years ago
patches_data.py	…
super_mox.py	depot_tools: Replace pylint error numbers with symbolic names.	9 years ago
trial_dir.py	…