blob: 7ef3a9cbdb097a14dbc5b1c6b3a4df6094adc018 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
Name: tcmalloc
URL: http://google-perftools.googlecode.com/
This contains Chromium's locally patched copy of tcmalloc.
Contents:
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: 93
Last Changed Date: 2010-04-22 21:29:02 +0400 (Thu, 22 Apr 2010)
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
|
