commit | c912114140868b880bd23382d3569d5394678ff4 | [log] [tgz] |
---|---|---|
author | Edward Lemur <ehmaldonado@chromium.org> | Thu Jun 14 22:09:46 2018 |
committer | Commit Bot <commit-bot@chromium.org> | Thu Jun 14 22:09:46 2018 |
tree | 5a459f8c58541d139f7e3bede279ad71843b2020 | |
parent | 0c91147d50ae4b67828a1d8551bb7ba876d5955d [diff] |
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>
Tools for working with Chromium development. It requires python 2.7.
The most important tools are:
fetch
: A gclient
wrapper to checkout a project. Use fetch --help
for more details.gclient
: A meta-checkout tool. Think repo or git submodules, except that it support OS-specific rules, e.g. do not checkout Windows only dependencies when checking out for Android. Use gclient help
for more details and README.gclient.md.git cl
: A code review tool to interact with Rietveld or Gerrit. Use git cl help
for more details and README.git-cl.md.roll-dep
: A gclient dependency management tool to submit a dep roll, updating a dependency to a newer revision.There are a lot of git utilities included.
depot_tools
updates itself automatically when running gclient
tool. To disable auto update, set the environment variable DEPOT_TOOLS_UPDATE=0
.
To update package manually, run update_depot_tools.bat
on Windows, or ./update_depot_tools
on Linux or Mac.
On Windows only, running gclient
will install git
and python
.
To contribute change for review:
git new-branch <somename> # Hack git add . git commit -a -m "Fixes goat teleporting" # find reviewers git cl owners git log -- <yourfiles> # Request a review. git cl upload -r reviewer1@chromium.org,reviewer2@chromium.org --send-mail # Edit change description if needed. git cl desc # If change is approved, flag it to be committed. git cl set-commit # If change needs more work. git rebase-update ... git cl upload -t "Fixes goat teleporter destination to be Australia"
See also open bugs, open reviews, forum or report problems.
To update cpplint.py, please submit the change upstream first at https://github.com/google/styleguide/tree/gh-pages/cpplint then copy it down.