third_party/tcmalloc/README.chromium - Issue 7050034: Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor)

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: third_party/tcmalloc/README.chromium

Issue 7050034: Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« base/allocator/allocator_shim.cc ('K') | « base/allocator/allocator_shim.cc ('k') | third_party/tcmalloc/chromium/src/base/arm_instruction_set_select.h » ('j') | third_party/tcmalloc/chromium/src/base/atomicops.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 Name: tcmalloc	1 Name: tcmalloc

2 Short Name: google-perftools	2 Short Name: google-perftools

3 URL: http://google-perftools.googlecode.com/	3 URL: http://google-perftools.googlecode.com/

4 Version: unknown	4 Version: unknown

5 Revision: 93	5 Revision: 109

6 Security Critical: yes	6 Security Critical: yes

7	7

8 Description:	8 Description:

9 This contains Chromium's locally patched copy of tcmalloc.	9 This contains Chromium's locally patched copy of tcmalloc.

10	10

11 Contents:	11 Contents:

12	12

13 chromium/	13 chromium/

14	14

15 The chromium patched sources, copied from the vendor/	15 The chromium patched sources, copied from the vendor/

(...skipping 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
70	70

71 $ svn merge -c {chrome-rev} svn://chrome-svn/chrome/trunk/src/third_part y/tcmalloc/vendor/src chromium/src	71 $ svn merge -c {chrome-rev} svn://chrome-svn/chrome/trunk/src/third_part y/tcmalloc/vendor/src chromium/src

72	72

73 2) Resolve any conflicts	73 2) Resolve any conflicts

74	74

75 3) Create the CL, upload, check in:	75 3) Create the CL, upload, check in:

76	76

77 $ gcl change CL	77 $ gcl change CL

78 $ gcl upload CL	78 $ gcl upload CL

79 $ gcl commit CL	79 $ gcl commit CL

OLD	NEW