Chromium Code Reviews| Index: README.md |
| diff --git a/README.md b/README.md |
| index 8d661ebf677031861c49f967f3adbbde610f12fb..619f7e5bd77b7a3d675174e80096db6fea913e86 100644 |
| --- a/README.md |
| +++ b/README.md |
| @@ -69,9 +69,41 @@ formats). For example: `out/Debug/pdfium_test --ppm path/to/myfile.pdf |
| The current health of the source tree can be found at |
| http://build.chromium.org/p/client.pdfium/console |
| +## Contributing code |
| + |
| +For contributing code, we will follow |
| +[Chromium's process](http://dev.chromium.org/developers/contributing-code) |
| +as much as possible. The main exceptions are: |
| + |
| +1. We will be using this |
| +[bug tracker](https://code.google.com/p/pdfium/issues/list), but for security bugs, |
|
Lei Zhang
2015/10/15 22:50:38
do we stick with 80 cols?
|
| +please use [Chromium's security bug template] |
| +(https://code.google.com/p/chromium/issues/entry?template=Security%20Bug) |
| +and add the "Cr-Internals-Plugins-PDF" label. |
| +2. Code has to conform to the existing style and not Chromium/Google style. |
| +3. There is no commit queue, approved committers can land their changes via `git cl land` |
| +4. Changes must be merged to the XFA branch as well (see below). |
| + |
| ## Branches |
| There is a branch for a forthcoming feature called XFA that you can get by |
| -following the steps above, then: `git checkout origin/xfa build/gyp_pdfium ninja |
| --C out/Debug |
| -` |
| +following the steps above, then: |
| + |
| +``` |
| +git checkout origin/xfa |
| +build/gyp_pdfium |
| +ninja -C out/Debug |
| +``` |
| + |
| +Merging to XFA requires: |
| + |
| +``` |
| +git checkout origin/xfa |
| +git checkout -b merge_branch |
| +git branch --set-upstream-to=origin/xfa |
| +git cherry-pick -x <commit hash> |
| +git commit --amend # add Merge to XFA |
| +git cl upload |
| +``` |
| + |
| +Then wait for approval, and `git cl land` |