Preface |
|
vii | |
|
|
1 | (16) |
|
The Perforce Filespec Syntax |
|
|
1 | (6) |
|
|
7 | (8) |
|
|
15 | (2) |
|
|
17 | (32) |
|
|
17 | (3) |
|
|
20 | (6) |
|
Synchronizing a Workspace |
|
|
26 | (3) |
|
Local Syntax, Wildcard Expansion, and Special Characters |
|
|
29 | (2) |
|
|
31 | (8) |
|
Working with Pending Changelists and Submitting Files |
|
|
39 | (5) |
|
Removing and Restoring Files |
|
|
44 | (2) |
|
|
46 | (3) |
|
Resolving and Merging Files |
|
|
49 | (38) |
|
Resolving: When, What, and How |
|
|
49 | (13) |
|
How Perforce Merges Text Files |
|
|
62 | (4) |
|
Reconciling Structural Changes |
|
|
66 | (8) |
|
Tips for Smoother Collaboration |
|
|
74 | (4) |
|
|
78 | (9) |
|
Branching and Integration |
|
|
87 | (40) |
|
The Classic Case for a Branch |
|
|
88 | (1) |
|
|
89 | (7) |
|
Integrating Changes from Branch to Branch |
|
|
96 | (16) |
|
Reconciling Structural Changes |
|
|
112 | (6) |
|
The Arcana of Integration |
|
|
118 | (9) |
|
|
127 | (17) |
|
Saving Important Configurations |
|
|
127 | (2) |
|
|
129 | (8) |
|
|
137 | (5) |
|
Jobs as Changelist Markers |
|
|
142 | (2) |
|
Controlling and Automating Activity |
|
|
144 | (23) |
|
|
144 | (2) |
|
Accessing Files in Other Domains |
|
|
146 | (4) |
|
Saving and Restoring Specs |
|
|
150 | (2) |
|
Change Notification and Change Monitoring |
|
|
152 | (5) |
|
|
157 | (6) |
|
Behind-the-Scenes Version Control |
|
|
163 | (4) |
|
|
167 | (22) |
|
The Story of Ace Engineering |
|
|
167 | (2) |
|
|
169 | (14) |
|
Ace Engineering Revisited |
|
|
183 | (3) |
|
|
186 | (3) |
|
Basic Codeline Management |
|
|
189 | (27) |
|
|
189 | (10) |
|
General Care and Feeding of Codelines |
|
|
199 | (6) |
|
|
205 | (3) |
|
Is Bug X Fixed in Codeline Y? |
|
|
208 | (8) |
|
|
216 | (33) |
|
Creating a Release Codeline |
|
|
216 | (6) |
|
Working in a Release Codeline |
|
|
222 | (5) |
|
Integrating Changes into the Mainline |
|
|
227 | (4) |
|
|
231 | (4) |
|
|
235 | (2) |
|
|
237 | (3) |
|
Retiring a Release Codeline |
|
|
240 | (2) |
|
Task Branches and Patch Branches |
|
|
242 | (7) |
|
|
249 | (33) |
|
Creating a Development Codeline |
|
|
249 | (6) |
|
Working in a Development Codeline |
|
|
255 | (3) |
|
Keeping a Development Codeline Up to Date |
|
|
258 | (5) |
|
Working with Third-Party Software |
|
|
263 | (4) |
|
Delivering Completed Development Work |
|
|
267 | (8) |
|
|
275 | (7) |
|
Staging Streams and Web Content |
|
|
282 | (23) |
|
|
282 | (6) |
|
Visual Content Development |
|
|
288 | (9) |
|
Bug Fixes and Staging Streams |
|
|
297 | (5) |
|
|
302 | (3) |
A. Setting Up a Perforce Test Environment |
|
305 | (6) |
B. Perforce Terminology and P4 Commands |
|
311 | (4) |
Bibliography |
|
315 | (2) |
Glossary |
|
317 | (4) |
Index |
|
321 | |