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.
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> |
7 years ago | |
|---|---|---|
| .. | ||
| gstools | ||
| auth_test.py | 8 years ago | |
| bot_update_coverage_test.py | 8 years ago | |
| checkout_test.py | 8 years ago | |
| download_from_google_storage_unittest.py | 8 years ago | |
| fix_encoding_test.py | ||
| gclient_eval_unittest.py | 7 years ago | |
| gclient_scm_test.py | 7 years ago | |
| gclient_smoketest.py | 7 years ago | |
| gclient_test.py | 7 years ago | |
| gclient_utils_test.py | 8 years ago | |
| git_cache_test.py | 8 years ago | |
| git_cl_creds_check_report.txt | 9 years ago | |
| git_cl_test.py | 8 years ago | |
| git_common_test.py | 8 years ago | |
| git_dates_test.py | ||
| git_drover_test.py | 8 years ago | |
| git_footers_test.py | 8 years ago | |
| git_hyper_blame_test.py | 8 years ago | |
| git_number_test.py | ||
| git_rebase_update_test.py | ||
| gsutil_test.py | 8 years ago | |
| metrics_test.py | 7 years ago | |
| owners_finder_test.py | 8 years ago | |
| owners_unittest.py | 8 years ago | |
| patch_test.py | ||
| presubmit_unittest.py | 8 years ago | |
| recipes_test.py | ||
| roll_dep_test.py | 7 years ago | |
| scm_unittest.py | 7 years ago | |
| subprocess2_test.py | ||
| upload_to_google_storage_unittest.py | 8 years ago | |
| watchlists_unittest.py | ||