Perforce 2005.2 P4 User's Guide
Table of Contents
Perforce on the Web
Next Chapter >>
List of Examples

Table of Contents

Table of Contents

List of Examples

Preface: About This Manual

Command line versus GUIs

Getting started with Perforce

Perforce documentation

Please give us feedback

Chapter 1: Installing P4

Installing P4 on UNIX and OS X

Installing P4 on Windows

Verifying the installation

Chapter 2: Configuring P4

Configuration overview
What is a client workspace?
How Perforce manages the workspace

Configuring Perforce settings
Using the command line
Using config files
Using the Windows registry
Using environment variables

Defining client workspaces

Verifying connections

Refining client views
Specifying mappings
Using wildcards in client views
Mapping files to different locations in the workspace
Mapping files to different filenames
Excluding files and directories
Mapping Windows workspaces across multiple drives
Using the same workspace from different machines

Changing the location of your workspace

Configuring workspace options

Configuring line-ending settings

Deleting client workspace specifications

Connection time limits

Chapter 3: Issuing P4 Commands

Command-line syntax
Specifying filenames on the command line
Perforce wildcards
Restrictions on filenames and identifiers
Specifying file revisions
Reporting commands

Using Perforce forms

Chapter 4: Managing Files and Changelists

Managing files
Syncing (retrieving) files
Adding files
Changing files
Discarding changes (reverting)
Deleting files

Managing changelists
Creating numbered changelists
Submitting changelists
Deleting changelists
Renaming and moving files
Displaying information about changelists

Diffing files

Working detached
Finding changed files
Submitting your changes

Chapter 5: Resolving Conflicts

How conflicts occur

How to resolve conflicts
Your, theirs, base and merge files
Options for resolving conflicts
Accepting yours, theirs, or merge
Editing the merge file
Merging to resolve conflicts
Full list of resolve options
Resolve command-line flags
Resolve reporting commands

Locking files
Preventing multiple resolves by locking files
Preventing multiple checkouts

Chapter 6: Codelines and Branching

Basic terminology

Organizing the depot

When to branch
Creating branches

Integrating changes
Integrating using branch specifications
Integrating between unrelated files
Integrating specific file revisions
Reintegrating and reresolving files
Integration reporting

Using labels
Tagging files with a label
Untagging files
Previewing tagging results
Listing files tagged by a label
Listing labels that have been applied to files
Using a label to specify file revisions
Deleting labels
Creating a label for future use
Restricting files that can be tagged
Using labels to archive workspace configurations
Preventing inadvertent tagging and untagging of files

Chapter 7: Defect Tracking

Managing jobs

Searching jobs
Searching job text
Searching specific fields
Using comparison operators
Searching date fields

Fixing jobs
Linking automatically
Linking manually
Linking jobs to changelists

Chapter 8: Scripting and Reporting

Common flags used in scripting and reporting

Scripting with Perforce forms

File reporting
Displaying file status
Displaying file revision history
Listing open files
Displaying file locations
Displaying file contents
Displaying annotations (details about changes to file contents)
Monitoring changes to files

Changelist reporting
Listing changelists
Listing files and jobs affected by changelists

Label reporting

Branch and integration reporting

Job reporting
Listing jobs
Listing jobs fixed by changelists

System configuration reporting
Displaying users
Displaying workspaces
Listing depots

Sample script

Appendix A: Glossary

Appendix B: Perforce File Types

Perforce file types

File type modifiers

Specifying how files are stored in the server

Overriding file types

Preserving timestamps

Expanding RCS keywords


This manual copyright 2005 Perforce Software.

All rights reserved.

Perforce software and documentation is available from You may download and use Perforce programs, but you may not sell or redistribute them. You may download, print, copy, edit, and redistribute the documentation, but you may not sell it, or sell any documentation derived from it. You may not modify or attempt to reverse engineer the programs.

Perforce programs and documents are available from our Web site as is. No warranty or support is provided. Warranties and support, along with higher capacity servers, are sold by Perforce Software.

Perforce Software assumes no responsibility or liability for any errors or inaccuracies that may appear in this book.

By downloading and using our programs and documents you agree to these terms.

Perforce and Inter-File Branching are trademarks of Perforce Software. Perforce software includes software developed by the University of California, Berkeley and its contributors.

All other brands or product names are trademarks or registered trademarks of their respective companies or organizations.

Perforce 2005.2 P4 User's Guide
Table of Contents
Perforce on the Web
Next Chapter >>
List of Examples
Please send comments and questions about this manual to [email protected].
Copyright 2005 Perforce Software. All rights reserved.
Last updated: 12/15/05