Commit Graph

9 Commits (235b70db85e63d3ef32941991845997c58b940b8)

Author SHA1 Message Date
Aaron Gable 9756104b69 Document drover process for re-landing a CL in a release branch.
BUG=735230

Change-Id: Ia75170b3ea13c4c14eb7e8066ecb533f69adbc8d
Reviewed-on: https://chromium-review.googlesource.com/542038
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Aaron Gable <agable@chromium.org>
8 years ago
Quinten Yearsley 442fb64cab depot_tools: Run automatic spell-checker.
Specifically, this CL was made by running codespell
(https://github.com/lucasdemarchi/codespell), manually filtering
for changes in non-third-party files that appear correct.

Change-Id: Ia16c1b29483d777744450d7bea45a178cf877a25
Reviewed-on: https://chromium-review.googlesource.com/420871
Commit-Queue: Quinten Yearsley <qyearsley@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
8 years ago
agable baba25e16b Update docs with latest changes
R=iannucci@chromium.org
BUG=630312

Review-Url: https://codereview.chromium.org/2170623003
9 years ago
sammc@chromium.org 8990189aed Support merging with conflicts with git-drover.
Currently, git-drover gives up and cleans up if the cherry-pick fails.
This change allows the user to manually resolve conflicts when using
git-drover.

BUG=404755

Review URL: https://codereview.chromium.org/1397313002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297429 0039d316-1c4b-4281-b951-d872f2087c98
9 years ago
sammc@chromium.org 900a33fb4d Add a git-drover.
This uses the same trick as git-new-workdir to reuse an existing git
checkout without interfering with it. However, this makes it only usable
on platforms where os.symlink exists.

BUG=404755

Review URL: https://codereview.chromium.org/1342383002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@296920 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
mmoss@chromium.org 6f9c7cfb79 Clear up some git-drover docs confusion.
TBR=iannucci@chromium.org

Review URL: https://codereview.chromium.org/561433002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@291889 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
mmoss@chromium.org 442678585a Add 'revert' example to git-drover docs.
TBR=iannucci@chromium.org

Review URL: https://codereview.chromium.org/549643002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@291840 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
mmoss@chromium.org a2e54c17a5 Add some more context to git-drover tutorial.
BUG=407284
R=iannucci@google.com

Review URL: https://codereview.chromium.org/507513002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@291619 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
mmoss@chromium.org 62e41c3487 Add stub git-drover documentation.
R=iannucci@google.com
BUG=261738

Review URL: https://codereview.chromium.org/494873003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@290946 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago