Administering Perforce?

New 99.2 Features

The Example Set

Please Give Us Feedback

Perforce Architecture

Moving Files Between the Clients and the Server

File Conflicts

Labeling Groups of Files

Branching Files

Job Tracking

Change Review, Daemons, and Triggers

Protections

Verifying the Connection to the p4d Server

Telling p4 Where p4d is

Underlying Concepts

   File Configurations Used in the Examples

Setting Up a Client Workspace

   Naming the Client Workspace

   Describing the Client Workspace to the Perforce Server

Retrieving Files from the Depot into a Workspace

Copying Files from the Workspace to the Depot

   Adding Files to the Depot

Populating empty depots

   Updating Depot Files

   Deleting Files From the Depot

   Submitting with Multiple Operations

Reverting Files to their Unopened States

Basic Reporting Commands

Description of the Client Workspace

Wildcards

   Wildcards and "p4 add"

Mapping the Depot to the Client Workspace

   Multiple Depots

   Using Views

   Wildcards in Views

   Types of Mappings

Direct Client-to-Depot Views

Mapping the Full Client to only Part of the Depot

Mapping Files in the Depot to a Different Part of the Client

Excluding Files and Directories from the View

Allowing Filenames in the Client to differ from Depot Filenames

Changing the Order of Filename Substrings

Two Mappings Can Conflict and Fail

Editing Existing Client Specifications

   Deleting an Existing Client Specification

Referring to Files on Command Lines

   Local Syntax

   Perforce Syntax

   Providing Files as Arguments to Commands

   Wildcards and Perforce Syntax

Name and String Limitations

   File Names

   Name and Description Lengths

   Using Spaces in Perforce Names

How to Specify Older File Revisions

   Using Revision Specifications without Filenames

Revision Ranges

File Types

Forms and Perforce Commands

   Reading Forms from Standard Input; Writing Forms to Standard Output

General Reporting Commands

RCS Format: How Perforce Stores File Revisions

   Only the Differences Between Revisions are Stored

   Use of "diff" to Determine File Revision Differences

Scheduling Resolves of Conflicting Files

Why "p4 sync" to Schedule a Resolve?

How Do I Know When a Resolve is Needed?

Performing Resolves of Conflicting Files

   File Revisions Used and Generated by "p4 resolve"

   Types of Conflicts Between File Revisions

   How the Merge File is Generated

   The "p4 resolve" Options

Using Flags with Resolve to Non-Interactively Accept Particular Revisions

   Binary Fileheads and "p4 resolve"

Locking Files to Minimize File Conflicts

   Preventing Multiple Resolves with File Locking

Resolves and Branching

Resolve Reporting

Reconfiguring the Perforce Environment with $P4CONFIG

Perforce Passwords

Command-Line Flags Common to All Perforce Commands

Working Detached

   Finding Changed Files with "p4 diff"

   Using "p4 diff" to Update the Depot

Refreshing files

Recommendations for Organizing the Depot

Renaming Files

Working with the Default Changelist

Creating Numbered Changelists Manually

Working With Numbered Changelists

Automatic Creation and Renumbering of Changelists

   When Submit of the Default Changelist Fails, the Changelist is Assigned a Number

Perforce May Renumber a Changelist upon Submission

Deleting Changelists

Changelist Reporting

Why Not Just Use Change Numbers?

Creating a Label

Adding and Changing Files Listed in a Label

   Previewing Labelsync's Results

Preventing Accidental Overwrites of a Label's Contents

Retrieving a Label's Contents into a Client Workspace

Deleting Labels

Label Reporting

What is Branching?

When to Create a Branch

Perforce's Branching Mechanisms: Introduction

Branching and Merging, Method 1: Branching with File Specifications

   Creating Branched Files

Why Not Just Copy the Files?

   Propagating Changes Between Branched Files

   Propagating Changes from Branched Files to the Original Files

Branching and Merging, Method 2: Branching with Branch Specifications

Branch Specification Usage Notes

Integration Usage Notes

Deleting Branches

Advanced Integration Functions

   Integrating Specific File Revisions

   Re-Integrating and Re-Resolving Files

How Integrate Works

   p4 integrate's Definitions of yours, theirs, and base

   The Integration Algorithm

   Integrate's Actions

Integration Reporting

For More Information

Job Usage Overview

Creating and Editing Jobs using the Default Job Specification

Creating and Editing Jobs with Custom Job Specifications

Viewing Jobs by Content with Jobviews

   Finding Jobs Containing Particular Words

   Finding Jobs by Field Values

   Negating the Sense of a Query

   Using Dates in Jobviews

   Comparison Operators and Field Types

Linking Jobs to Changelists

   Automatically Linking Jobs to Changelists with the p4 user Form

   Automatic Update of Job Status

   Manually Associating Jobs with Changelists

   What if There's No Status Field?

Deleting Jobs

Integrating to External Defect Tracking Systems

Job Reporting Commands

Files

   File Metadata

Basic File Information

File Revision History

Opened Files

   Relationships Between Client and Depot Files

   File Contents

Contents of a Single Revision

File Content Comparisons

Changelists

   Changelists that Meet Particular Criteria

   Files and Jobs Affected by Changelists

Labels

Branch and Integration Reporting

Job Reporting

   Basic Job Information

   Jobs, Fixes, and Changelists

Reporting for Daemons

System Configuration

Special Reporting Flags

Reporting with Scripting

   Comparing the Change Content of Two File Sets

   Changelists Submitted by Particular Users

Perforce software and documentation is available from http://www.perforce.com. 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.