diff options
Diffstat (limited to 'site/dev/contrib/patch.md')
| -rw-r--r-- | site/dev/contrib/patch.md | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/site/dev/contrib/patch.md b/site/dev/contrib/patch.md index cf8b35bdeb..b7b29f06fd 100644 --- a/site/dev/contrib/patch.md +++ b/site/dev/contrib/patch.md @@ -7,30 +7,31 @@ other situations too, like if you just want to try out somebody else's patch locally.) Notes: + * For the examples below, we will assume that this is the change you want to patch into your local checkout: https://codereview.appspot.com/6201055/ * These instructions should work on Mac or Linux; Windows is trickier, because there is no standard Windows "patch" tool. -See also: -http://dev.chromium.org/developers/contributing-code#TOC-Instructions-for-Reviewer:-Checking-in-the-patch-for-a-non-committer +See also [Contributing Code for The Chromium Projects] +(http://dev.chromium.org/developers/contributing-code#TOC-Instructions-for-Reviewer:-Checking-in-the-patch-for-a-non-committer). -If you use git cl, then you should be able to use the shortcut: +If you use `git cl`, then you should be able to use the shortcut: ~~~~ git cl patch 6201055 ~~~~ -If you use gcl, or the above doesn't work, the following should always work. +If you use `gcl`, or the above doesn't work, the following should always work. 1. Prepare your local workspace to accept the patch. - * cd into the root directory (usually trunk/) of the workspace where you + * cd into the root directory (usually `trunk/`) of the workspace where you want to apply the patch. * Make sure that the workspace is up-to-date and clean (or "updated and clean enough" for your purposes). If the codereview patch was against an old revision of the repo, you may need to sync your local workspace - to that same revision... + to that same revision. 2. Download the raw patch set. @@ -50,7 +51,7 @@ If you use gcl, or the above doesn't work, the following should always work. ~~~~ * Otherwise, figure out some other way to download this file and save it as - 'patch.txt' + `patch.txt` 3. Apply this patch to your local checkout. @@ -61,12 +62,12 @@ If you use gcl, or the above doesn't work, the following should always work. patch -p1 <patch.txt ~~~~ - * Then you can run diff and visually check the local changes. + * Then you can run `diff` and visually check the local changes. 4. Complications: If the patch fails to apply, the following may be happening: - Wrong revision. Maybe your local workspace is not up to date? Or maybe the - patch was made against an old revision of the repository, and cannot be applied - to the latest revision? (In that case, revert any changes and sync your - workspace to an older revision, then re-apply the patch.) + * Wrong revision. Maybe your local workspace is not up to date? Or maybe the + patch was made against an old revision of the repository, and cannot be applied + to the latest revision? (In that case, revert any changes and sync your + workspace to an older revision, then re-apply the patch.) |