When a changelist is submitted to the depot, the depot is updated atomically: either all of the files in the changelist are updated in the depot, or none of them are. This grouping of files as a single unit guarantees that code alterations spanning multiple files are updated in the depot simultaneously. To reflect the atomic nature of changelist submissions, submission of a changelist is sometimes called an atomic change transaction.

Perforce attempts to make changelist usage as transparent as possible: in the normal case, Perforce commands such as p4 edit add the affected files to the default changelist, and p4 submit sends the default changelist to the server for processing. However, there are two sets of circumstances that would require the user to understand and manipulate non-default changelists:

• Sometimes a user wants to split files into separate groups for submission.

For example, suppose a user is fixing two bugs, each of which spans a separate set of files. Rather than submit the fixes to both bugs in a single changelist, the user might elect to create one changelist for the files that fix the first bug, and another changelist for the files that fix the second bug. Each changelist would be submitted to the depot via separate p4 submit operations.

• Under certain circumstances, the p4 submit command can fail.

For example, if one user has a file locked and another user submits a changelist that contains that file, the submit fails. When a submit of the default changelist fails, the changelist is assigned a number, is no longer the default changelist, and must be referred to by its number.

Working with the Default Changelist

Note	The material in this subsection has already been presented in a slightly different form in earlier chapters. It is presented again here to provide a complete discussion of changelists.

Each of the files in the changelist is said to be open within the client workspace: the first of the files above was opened for edit with p4 edit, and the second was opened for deletion with p4 delete.

The files in the changelist are updated within the depot with p4 submit, which sends the changelist to the server; the server processes the files contained in the changelist and alters the depot accordingly.

The commands that add or remove files from changelists are:

By default, these commands, and p4 submit, act on the default changelist. For example, if you type p4 add filename, this file is added to the default changelist. When you type p4 submit, the default changelist is submitted.

When you type p4 submit, a change form is displayed, containing the files in the default changelist. Any file can be deleted from this list; when a file is deleted, it is moved to the next default changelist, and will appear again the next time you type p4 submit. A changelist must contain a user-entered description, which describes the nature of the changes being made.

p4 submit can take an optional, single file pattern as an argument. In this case, only those files in the default changelist that match the file pattern are included in the submitted changelist. Since the p4d server program must receive this file pattern as a single argument, make sure to escape the * wildcard if it is used.

When the user quits from the p4 submit editor, the changelist is submitted to the server and the server attempts to update the files in the depot. If there are no problems, the changelist is assigned a sequential number, and its status changes from new or pending to submitted. Once a changelist has been submitted, it becomes a permanent part of the depot's metadata, and is unchangeable except by Perforce superusers.

Creating Numbered Changelists Manually

All files in the default changelist are moved to this new changelist. When you quit from the form, the changelist is assigned the next changelist number in sequence, and this changelist must be subsequently referred to by this change number. Files can be deleted from the changelist by editing the form; files deleted from this changelist are moved to the next default changelist. The status for a changelist created by this method is pending until you submit the files in the changelist.

Any single client file can be included in only one pending changelist.

Working With Numbered Changelists

You can move files from one changelist to another with p4 reopen -c changenum filenames, where changenum is the number of the moving-to changelist. If you are moving files to the default changelist, use p4 reopen -c default filenames.

Example:  Working with multiple changelists.

Ed is working on two bug fixes simultaneously. One of the bugs involves mail filtering and requires updates of files in the filter subdirectory; the other problem is in the aliasing system, and requires an update of utils/elmalias.c.

Ed wants to update each bug separately in the depot; this will allow him to refer to one bug fix by one change number and the other bug fix by another change number. He's already started fixing both bugs, and has opened some of the affected files for edit. He types p4 change, and sees

Change: new Client: eds_elm User:   edk Status: new Description:         <enter description here> Files:         //depot/elm_proj/filter/filter.c   # edit         //depot/elm_proj/filter/lock.c     # edit         //depot/elm_proj/utils/elmalias.c  # edit

Ed wants to use this changelist to submit only the fix to the filter problems. He changes the form, deleting the last file revision from the file list. When he's done, the form looks like this:

Change: new Client: eds_elm User:   edk Status: new Description:         Fixes filtering problems Files:         //depot/elm_proj/filter/filter.c   # edit         //depot/elm_proj/filter/lock.c     # edit

When he quits from the editor, he's told

    Change 29 created with 2 open file(s).

He fixes both bugs at his leisure. He realizes that the filter problem requires updates to another file: filter/lock.c. He opens this file for edit with p4 edit -c 29 filter/lock.c; opening the file with the -c 29 flag puts the file in changelist 29, which he created above. (If the file had already been open for edit in the default changelist, he could have moved it to changelist 29 with p4 reopen -c 29 filter/lock.c).

Ed finishes fixing the aliasing bug, and, since the affected files are in the default changelist, he submits the changelist with a straightforward p4 submit. He'll finish fixing the filtering bug later.

Automatic Creation and Renumbering of Changelists

When submit of the default changelist fails,
the changelist is assigned a number

• A file in the changelist has been locked by another user with p4 lock.

• The client workspace no longer contains a file included in the changelist.

• There is a server error, such as not enough disk space.

• The user was not editing the head revision of a particular file. The following sequence shows an example of how this can occur:
  • User A types p4 edit //depot/foo,

  • User B types p4 edit //depot/foo,

  • User B submits her default changelist, and

  • User A submits his default changelist.

User A's submit is rejected, since the file revision of foo that he edited is no longer the head revision of that file.

If the submit failed because the client-owned revision of the file is not the head revision, a merge must be performed before the changelist will be accepted. (File merging is described in Chapter 5, Perforce Basics: Resolving File Conflicts).

Perforce May Renumber a Changelist upon Submission

Example:  Automatic renumbering of changelists

Ed has finished fixing the filtering bug that he's been using changelist 29 for. Since he created that changelist, he's submitted another changelist (change 30), and two other users have submitted changelists. Ed submits change 29 with p4 submit -c 29, and is told:

Change 29 renamed change 33 and submitted.

Deleting Changelists

Changelists that have already been submitted can be deleted by the superuser only under very specific circumstances. Please see the Perforce System Administrator's Guide for more information.

Changelist Reporting