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 '79d42dfb11'
${ noResults }
depot_tools/testing_support
History
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 Reduce auto_stub.py by removing python 2.6 support code. 11 years ago
cipd gclient: Add a test to make sure we're syncing CIPD dependencies. 7 years ago
cipd.bat gclient: Add a test to make sure we're syncing CIPD dependencies. 7 years ago
coverage_utils.py Disable coverage in depot_tools tests. 8 years ago
fake_cipd.py gclient: Add a test to make sure we're syncing CIPD dependencies. 7 years ago
fake_repos.py Revert "gclient_scm: Use cherry-picking instead of rebasing." 7 years ago
filesystem_mock.py Fix relative file: paths in OWNERS with roots other than '/' 9 years ago
gerrit-init.sh testing_support: fix Gerrit releases URL. 9 years ago
gerrit_test_case.py Reland "Refactor ReadHttpResponse to be error-friendlier" 8 years ago
git_test_utils.py git_test_utils: Fixed custom git metadata in git commit schemas. 7 years ago
patches_data.py Fix applying git diff with new file mode 644 on a svn checkout. 13 years ago
super_mox.py depot_tools: Replace pylint error numbers with symbolic names. 8 years ago
trial_dir.py Remove gclient_utils.RemoveDirectory(). 12 years ago