• Edward Lemur's avatar
    gclient_scm: Use cherry-picking instead of rebasing. · fb78b368
    Edward Lemur authored
    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: 's avatarAaron Gable <agable@chromium.org>
    fb78b368
Name
Last commit
Last update
..
gstools Loading commit data...
auth_test.py Loading commit data...
bot_update_coverage_test.py Loading commit data...
checkout_test.py Loading commit data...
download_from_google_storage_unittest.py Loading commit data...
fix_encoding_test.py Loading commit data...
gclient_eval_unittest.py Loading commit data...
gclient_scm_test.py Loading commit data...
gclient_smoketest.py Loading commit data...
gclient_test.py Loading commit data...
gclient_utils_test.py Loading commit data...
git_cache_test.py Loading commit data...
git_cl_creds_check_report.txt Loading commit data...
git_cl_test.py Loading commit data...
git_common_test.py Loading commit data...
git_dates_test.py Loading commit data...
git_drover_test.py Loading commit data...
git_footers_test.py Loading commit data...
git_hyper_blame_test.py Loading commit data...
git_number_test.py Loading commit data...
git_rebase_update_test.py Loading commit data...
gsutil_test.py Loading commit data...
metrics_test.py Loading commit data...
owners_finder_test.py Loading commit data...
owners_unittest.py Loading commit data...
patch_test.py Loading commit data...
presubmit_unittest.py Loading commit data...
recipes_test.py Loading commit data...
roll_dep_test.py Loading commit data...
scm_unittest.py Loading commit data...
subprocess2_test.py Loading commit data...
upload_to_google_storage_unittest.py Loading commit data...
watchlists_unittest.py Loading commit data...