Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

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

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

Powered by Google App Engine
This is Rietveld 408576698