diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 21:23:28 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 21:23:28 +0000 |
commit | e278f855461d250d446417dbe48472dc7145503d (patch) | |
tree | 5f59a705d7f4159e994c53f69d4ac6381f1dee1d /third_party/tcmalloc | |
parent | 7b1e54ab705914db175a849176d231be09ecfcf5 (diff) | |
download | chromium_src-e278f855461d250d446417dbe48472dc7145503d.zip chromium_src-e278f855461d250d446417dbe48472dc7145503d.tar.gz chromium_src-e278f855461d250d446417dbe48472dc7145503d.tar.bz2 |
Set missing LF eol-style.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44539 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc')
-rw-r--r-- | third_party/tcmalloc/README.chromium | 150 |
1 files changed, 75 insertions, 75 deletions
diff --git a/third_party/tcmalloc/README.chromium b/third_party/tcmalloc/README.chromium index 33dcb0f..f699fc9f 100644 --- a/third_party/tcmalloc/README.chromium +++ b/third_party/tcmalloc/README.chromium @@ -1,75 +1,75 @@ -This contains Chromium's locally patched copy of tcmalloc.
-
-Contents:
-
- README.chromium
-
- This file you're looking at right now.
-
- chromium/
-
- The chromium patched sources, copied from the vendor/
- subdirectory and containing our local modifications.
-
- We only copy over the vendor/src/ subdirectory (the only piece
- we need) but still leave it in a chromium/src/ subdirectory to
- keep the directory structures in parallel.
-
- vendor/
-
- Vanilla sources from upstream:
-
- http://google-perftools.googlecode.com/svn/trunk
-
- The current revision is:
-
- Last Changed Rev: 77
- Last Changed Date: 2009-10-27 10:30:52 -0700 (Tue, 27 Oct 2009)
-
-
-
-HOWTOs:
-
- Take a new version from upstream:
-
- 1) Grab the revision:
-
- $ svn export [-r {tcmalloc-rev}] \
- http://google-perftools.googlecode.com/svn/trunk \
- vendor-{tcmalloc-rev}
-
- 2) Check for added or deleted files:
-
- $ diff -q -r -x .svn vendor vendor-{tcmalloc-rev}
-
- 3) Copy the new revision on top of the checked-in vendor branch:
-
- $ cp -r vendor-{tcmalloc-rev}/* vendor
-
- C:\> xcopy /e/y/i vendor-{tcmalloc-rev}\* vendor
-
- 4) "svn add" or "svn rm" added or removed files (based on your
- "diff -q -r" output from above)
-
- 5) Create the CL, upload, check it in:
-
- $ gcl change CL
- $ gcl upload CL
- $ gcl commit CL
-
- Note the revision number since you're going to want to merge
- that to the local chromium branch.
-
- Merge a new upstream version with our local patched copy:
-
- 1) Merge the local revision to chromium/src
-
- $ svn merge -c {chrome-rev} svn://chrome-svn/chrome/trunk/src/third_party/tcmalloc/vendor/src chromium/src
-
- 2) Resolve any conflicts
-
- 3) Create the CL, upload, check in:
-
- $ gcl change CL
- $ gcl upload CL
- $ gcl commit CL
+This contains Chromium's locally patched copy of tcmalloc. + +Contents: + + README.chromium + + This file you're looking at right now. + + chromium/ + + The chromium patched sources, copied from the vendor/ + subdirectory and containing our local modifications. + + We only copy over the vendor/src/ subdirectory (the only piece + we need) but still leave it in a chromium/src/ subdirectory to + keep the directory structures in parallel. + + vendor/ + + Vanilla sources from upstream: + + http://google-perftools.googlecode.com/svn/trunk + + The current revision is: + + Last Changed Rev: 77 + Last Changed Date: 2009-10-27 10:30:52 -0700 (Tue, 27 Oct 2009) + + + +HOWTOs: + + Take a new version from upstream: + + 1) Grab the revision: + + $ svn export [-r {tcmalloc-rev}] \ + http://google-perftools.googlecode.com/svn/trunk \ + vendor-{tcmalloc-rev} + + 2) Check for added or deleted files: + + $ diff -q -r -x .svn vendor vendor-{tcmalloc-rev} + + 3) Copy the new revision on top of the checked-in vendor branch: + + $ cp -r vendor-{tcmalloc-rev}/* vendor + + C:\> xcopy /e/y/i vendor-{tcmalloc-rev}\* vendor + + 4) "svn add" or "svn rm" added or removed files (based on your + "diff -q -r" output from above) + + 5) Create the CL, upload, check it in: + + $ gcl change CL + $ gcl upload CL + $ gcl commit CL + + Note the revision number since you're going to want to merge + that to the local chromium branch. + + Merge a new upstream version with our local patched copy: + + 1) Merge the local revision to chromium/src + + $ svn merge -c {chrome-rev} svn://chrome-svn/chrome/trunk/src/third_party/tcmalloc/vendor/src chromium/src + + 2) Resolve any conflicts + + 3) Create the CL, upload, check in: + + $ gcl change CL + $ gcl upload CL + $ gcl commit CL |