| OLD | NEW |
| 1 Name: tcmalloc |
| 2 URL: http://google-perftools.googlecode.com/ |
| 3 |
| 1 This contains Chromium's locally patched copy of tcmalloc. | 4 This contains Chromium's locally patched copy of tcmalloc. |
| 2 | 5 |
| 3 Contents: | 6 Contents: |
| 4 | 7 |
| 5 README.chromium | |
| 6 | |
| 7 This file you're looking at right now. | |
| 8 | |
| 9 chromium/ | 8 chromium/ |
| 10 | 9 |
| 11 The chromium patched sources, copied from the vendor/ | 10 The chromium patched sources, copied from the vendor/ |
| 12 subdirectory and containing our local modifications. | 11 subdirectory and containing our local modifications. |
| 13 | 12 |
| 14 We only copy over the vendor/src/ subdirectory (the only piece | 13 We only copy over the vendor/src/ subdirectory (the only piece |
| 15 we need) but still leave it in a chromium/src/ subdirectory to | 14 we need) but still leave it in a chromium/src/ subdirectory to |
| 16 keep the directory structures in parallel. | 15 keep the directory structures in parallel. |
| 17 | 16 |
| 18 vendor/ | 17 vendor/ |
| 19 | 18 |
| 20 Vanilla sources from upstream: | 19 Vanilla sources from upstream: |
| 21 | 20 |
| 22 http://google-perftools.googlecode.com/svn/trunk | 21 http://google-perftools.googlecode.com/svn/trunk |
| 23 | 22 |
| 24 The current revision is: | 23 The current revision is: |
| 25 | 24 |
| 26 Last Changed Rev: 77 | 25 Last Changed Rev: 77 |
| 27 Last Changed Date: 2009-10-27 10:30:52 -0700 (Tue, 27 Oct 2009) | 26 Last Changed Date: 2009-10-27 10:30:52 -0700 (Tue, 27 Oct 2009) |
| 28 | 27 |
| 29 | 28 |
| 30 | 29 |
| 31 HOWTOs: | 30 HOWTOs: |
| 32 | 31 |
| 33 Take a new version from upstream: | 32 Take a new version from upstream: |
| 34 | 33 |
| 35 1) Grab the revision: | 34 1) Grab the revision: |
| 36 | 35 |
| 37 $ svn export [-r {tcmalloc-rev}] \ | 36 $ svn export [-r {tcmalloc-rev}] \ |
| 38 http://google-perftools.googlecode.com/svn/trunk \ | 37 http://google-perftools.googlecode.com/svn/trunk \ |
| 39 vendor-{tcmalloc-rev} | 38 vendor-{tcmalloc-rev} |
| 40 | 39 |
| 41 2) Check for added or deleted files: | 40 2) Check for added or deleted files: |
| 42 | 41 |
| 43 $ diff -q -r -x .svn vendor vendor-{tcmalloc-rev} | 42 $ diff -q -r -x .svn vendor vendor-{tcmalloc-rev} |
| 44 | 43 |
| 45 3) Copy the new revision on top of the checked-in vendor branch: | 44 3) Copy the new revision on top of the checked-in vendor branch: |
| 46 | 45 |
| 47 $ cp -r vendor-{tcmalloc-rev}/* vendor | 46 $ cp -r vendor-{tcmalloc-rev}/* vendor |
| 48 | 47 |
| 49 C:\> xcopy /e/y/i vendor-{tcmalloc-rev}\* vendor | 48 C:\> xcopy /e/y/i vendor-{tcmalloc-rev}\* vendor |
| 50 | 49 |
| 51 4) "svn add" or "svn rm" added or removed files (based on your | 50 4) "svn add" or "svn rm" added or removed files (based on your |
| 52 "diff -q -r" output from above) | 51 "diff -q -r" output from above) |
| 53 | 52 |
| 54 5) Create the CL, upload, check it in: | 53 5) Create the CL, upload, check it in: |
| 55 | 54 |
| 56 $ gcl change CL | 55 $ gcl change CL |
| 57 $ gcl upload CL | 56 $ gcl upload CL |
| 58 $ gcl commit CL | 57 $ gcl commit CL |
| 59 | 58 |
| 60 Note the revision number since you're going to want to merge | 59 Note the revision number since you're going to want to merge |
| 61 that to the local chromium branch. | 60 that to the local chromium branch. |
| 62 | 61 |
| 63 Merge a new upstream version with our local patched copy: | 62 Merge a new upstream version with our local patched copy: |
| 64 | 63 |
| 65 1) Merge the local revision to chromium/src | 64 1) Merge the local revision to chromium/src |
| 66 | 65 |
| 67 $ svn merge -c {chrome-rev} svn://chrome-svn/chrome/trunk/src/third_part
y/tcmalloc/vendor/src chromium/src | 66 $ svn merge -c {chrome-rev} svn://chrome-svn/chrome/trunk/src/third_part
y/tcmalloc/vendor/src chromium/src |
| 68 | 67 |
| 69 2) Resolve any conflicts | 68 2) Resolve any conflicts |
| 70 | 69 |
| 71 3) Create the CL, upload, check in: | 70 3) Create the CL, upload, check in: |
| 72 | 71 |
| 73 $ gcl change CL | 72 $ gcl change CL |
| 74 $ gcl upload CL | 73 $ gcl upload CL |
| 75 $ gcl commit CL | 74 $ gcl commit CL |
| OLD | NEW |