| OLD | NEW |
| 1 Name: tcmalloc | 1 Name: tcmalloc |
| 2 Short Name: google-perftools |
| 2 URL: http://google-perftools.googlecode.com/ | 3 URL: http://google-perftools.googlecode.com/ |
| 4 Version: unknown |
| 5 Revision: 93 |
| 3 | 6 |
| 7 Description: |
| 4 This contains Chromium's locally patched copy of tcmalloc. | 8 This contains Chromium's locally patched copy of tcmalloc. |
| 5 | 9 |
| 6 Contents: | 10 Contents: |
| 7 | 11 |
| 8 chromium/ | 12 chromium/ |
| 9 | 13 |
| 10 The chromium patched sources, copied from the vendor/ | 14 The chromium patched sources, copied from the vendor/ |
| 11 subdirectory and containing our local modifications. | 15 subdirectory and containing our local modifications. |
| 12 | 16 |
| 13 We only copy over the vendor/src/ subdirectory (the only piece | 17 We only copy over the vendor/src/ subdirectory (the only piece |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 | 69 |
| 66 $ svn merge -c {chrome-rev} svn://chrome-svn/chrome/trunk/src/third_part
y/tcmalloc/vendor/src chromium/src | 70 $ svn merge -c {chrome-rev} svn://chrome-svn/chrome/trunk/src/third_part
y/tcmalloc/vendor/src chromium/src |
| 67 | 71 |
| 68 2) Resolve any conflicts | 72 2) Resolve any conflicts |
| 69 | 73 |
| 70 3) Create the CL, upload, check in: | 74 3) Create the CL, upload, check in: |
| 71 | 75 |
| 72 $ gcl change CL | 76 $ gcl change CL |
| 73 $ gcl upload CL | 77 $ gcl upload CL |
| 74 $ gcl commit CL | 78 $ gcl commit CL |
| OLD | NEW |