Previous Table of Contents Index Next
Perforce 2009.2: P4 User's Guide



Appendix A
 
An access level that gives the user permission to run Perforce commands that override metadata but do not affect the state of the server.
Perforce file type assigned to Macintosh files that are stored using AppleSingle format, permitting the data fork and resource fork to be stored as a single file.
atomic change
transaction
Grouping operations affecting a number of files in a single transaction. If all operations in the transaction succeed, all the files are updated. If any operation in the transaction fails, none of the files are updated.
Perforce file type assigned to a nontext file. By default, the contents of each revision are stored in full, and the file is stored in compressed format.
(noun) A codeline created by copying another codeline, as opposed to a codeline that was created by adding original files. branch is often used as a synonym for branch view.
(verb) To create a codeline branch with p4 integrate.
Specifies how a branch is to be created by defining the location of the original codeline and the branch. The branch mapping is used by the integration process to create and update branches. Client workspaces, labels, and branch specifications cannot share the same name.
A specification of the branching relationship between two codelines in the depot. Each branch view has a unique name and defines how files are mapped from the originating codeline to the target codeline. See branch.
An atomic change transaction in Perforce. The changes specified in the changelist are not stored in the depot until the changelist is submitted to the depot.
The process of sending email to users who have registered their interest in changes made to specified files in the depot.
The root directory of a client workspace. If two or more client workspaces are located on one machine, they cannot share a root directory.
The right-hand side of a mapping within a client view, specifying where the corresponding depot files are located in the client workspace.
A set of mappings that specifies the correspondence between file locations in the depot and the client workspace.
Directories on the client machine where you work on file revisions that are managed by Perforce. By default this name is set to the name of the host machine on which the client workspace is located; to override the default name, set the P4CLIENT environment variable. Client workspaces, labels, and branch specifications cannot share the same name.
A set of files that evolve collectively. One codeline can be branched from another, allowing each set of files to evolve separately.
One type of conflict occurs when two users open a file for edit. One user submits the file, after which the other user can't submit because of a conflict. The cause of this type of conflict is two users opening the same file.
The other type of conflict is when users try to merge one file into another. This type of conflict occurs when the comparison of two files to a common base yields different results, indicating that the files have been changed in different ways. In this case, the merge can't be done automatically and must be done by hand. The type of conflict is caused by nonmatching diffs.
A numeric variable used by Perforce to track changelist numbers in conjunction with the review feature.
The changelist used by Perforce commands, unless a numbered changelist is specified. A default pending changelist is created automatically when a file is opened for edit.
In Perforce, a file with its head revision marked as deleted. Older revisions of the file are still available.
A file repository on the Perforce server. It contains all versions of all files ever submitted to the depot. There can be multiple depots on a single server.
(noun) A set of lines that don't match when two files are compared. A conflict is a pair of unequal diffs between each of two files and a common third file.
(verb) To compare the contents of files or file revisions.
In a three-way file merge, a situation in which two revisions of a file differ from each other and from their base file.
Also: an attempt to submit a file that is not an edit of the head revision of the file in the depot; typically occurs when another user opens the file for edit after you have opened the file for edit.
A specific version of a file within the depot. Each revision is assigned a number, in sequence. Any revision can be accessed in the depot by its revision number, for example: testfile#3.
An attribute that determines how Perforce stores and diffs a particular file. Examples of file types are text and binary.
Screens displayed by certain Perforce commands. For example, you use the Perforce change form to enter comments about a particular changelist and to verify the affected files.
full-file
storage
The method by which Perforce stores revisions of binary files in the depot: every file revision is stored in full. Contrast this with reverse delta storage, which Perforce uses for text files.
The most recent revision of a file within the depot. Because file revisions are numbered sequentially, this revision is the highest-numbered revision of that file.
Inter-File
Branching
A user-defined unit of work tracked by Perforce. The job template determines what information is tracked. The template can be modified by the Perforce system administrator
A file containing a record of every change made to the Perforce server's metadata since the time of the last checkpoint.
A method used by Perforce to make internal copies of files without duplicating file content in the depot. Lazy copies minimize the consumption of disk space by storing references to the original file instead of copies of the file.
A protection level that enables you to run reporting commands but prevents access to the contents of files.
A Perforce file lock prevents other clients from submitting the locked file. Files are unlocked with the p4 unlock command or submitting the changelist that contains the locked file.
Error output from the Perforce server. By default, error output is written to standard error. To specify a log file, set the P4LOG environment variable or use the p4d -L flag when starting the server.
A single line in a view, consisting of a left side and a right side that specify the correspondences between files in the depot and files in a client, label, or branch. The left side specifies the depot files, and the right side specifies the client files.
The data stored by the Perforce server that describes the files in the depot, the current state of client workspaces, protections, users, clients, labels, and branches. Metadata includes all the data stored in the server except for the actual contents of the files.
nonexistent
revision
A completely empty revision of any file. Syncing to a nonexistent revision of a file removes it from your workspace. An empty file revision created by deleting a file and the #none revision specifier are examples of nonexistent file revisions.
The Perforce Command-Line Client program, and the command you issue to execute Perforce commands from the operating system command line.
A Perforce application that displays the differences between two files. P4Diff is the default application used to compare files during the file resolution process.
The Perforce depot and metadata on a central host. Also the program that manages the depot and metadata.
Revision Control System format. Used for storing revisions of text files. RCS format uses reverse delta encoding for file storage. Perforce uses RCS format to store text files. See also reverse delta storage.
One fork of a Macintosh file. (Macintosh files are composed of a resource fork and a data fork.) You can store resource forks in Perforce depots as part of an AppleSingle file by using Perforce's apple file type.
The method that Perforce uses to store revisions of text files. Perforce stores the changes between each revision and its previous revision, plus the full text of the head revision.
A special protections level that includes read and list accesses and grants permission to run the p4 review command.
A range of revision numbers for a specified file, specified as the low and high end of the range. For example, myfile#5,7 specifies revisions 5 through 7 of myfile.
A suffix to a filename that specifies a particular revision of that file. Revision specifiers can be revision numbers, change numbers, label names, date/time specifications, or client names.
In Perforce, the program that executes the commands sent by client programs. The Perforce server (p4d) maintains depot files and metadata describing the files and also tracks the state of client workspaces.
The directory in which the server program stores its metadata and all the shared files. To specify the server root, set the P4ROOT environment variable.
For a changelist, a value that indicates whether the changelist is new, pending, or submitted. For a job, a value that indicates whether the job is open, closed, or suspended. You can customize job statuses.
An access level that gives the user permission to run every Perforce command, including commands that set protections, install triggers, or shut down the server for maintenance.
A Perforce file type assigned to UNIX symbolic links. On non-UNIX clients, symlink files are stored as text files.
The file that receives the changes from the donor file when you are integrating changes between a branched codeline and the original codeline.
The revision in the depot with which the client file is merged when you resolve a file conflict. When you are working with branched files, theirs is the donor file.
The process of combining three file revisions. During a three-way merge, you can identify where conflicting changes have occurred and specify how you want to resolve the conflicts.
In Perforce, the head revision. Tip revision is a term used by some other SCM systems.
The process of combining two file revisions. In a two-way merge, you can see differences between the files but cannot see conflicts.
* matches anything except a slash
... matches anything including slashes
%%0 through %%9 used for parameter substitution in views
A protection level that enables you to run commands that alter the contents of files in the depot. Write access includes read and list accesses.
The edited version of a file in the client workspace when you resolve a file. Also, the target file when you integrate a branched file.
 


Previous Table of Contents Index Next

Perforce 2009.2: P4 User's Guide
Copyright 2005-2009 Perforce Software.