How to view Shelved P4 Changes

perforceshelve

One of our team member (located in different region) has shelved changes in P4 with changelist 1234.

Now, if I want to see what files are modified snf what are the changes, how can I do this?

What is the P4 command that I should use to see the changes made by our team member?

Best Answer

p4 describe -S 1234 should to the trick, see the documentation on describe.

To see the file content you would unshelve the files into your workspace (assuming you have a workspace for the same project your colleague is working on).

Create a new (empty) changelist with p4 change (results in e.g. 2345), then use p4 unshelve (docu) to get the modified files to your workspace:

p4 unshelve -s 1234 -c 2345

If you don't want the modified files in your workspace any longer, you can p4 revert -c 2345 them.

Related Solutions

The difference between “Rollback…” and “Back Out Submitted Changelist #####” in Perforce P4V

Both of these operations restore a set of files to a previous state and are essentially faster, safer ways of undoing mistakes than using the p4 obliterate command (and you don't need admin access to use them).

In the case of "Rollback...", this could be any number of files, even an entire depot. You can tell it to rollback to a specific revision, changelist, or label. The files are restored to the state they were in at the time of creation of that revision, changelist, or label.

In the case of "Back Out Submitted Changelist #####", the restore operation is restricted to the files that were submitted in changelist #####. Those files are restored to the state they were in before you submitted that changelist, provided no changes have been made to those files since. If subsequent changes have been made to any of those files, Perforce will tell you that those files are now out of date. You will have to sync to the head revision and then resolve the differences. This way you don't inadvertently clobber any changes that you actually want to keep.

Both operations work by essentially submitting old revisions as new revisions. When you perform a "Rollback...", you are restoring the files to the state they were in at a specific point in time, regardless of what has happened to them since. When you perform a "Back out...", you are attempting to undo the changes you made at a specific point in time, while maintaining the changes that have occurred since.

Showing a change in a shelved perforce file

If you know the revision of the shelved file (e.g. #4) and the head revision (#3 in this case) you can use

p4 diff2 //path/to/depot/file#3 //path/to/depot/file@=<changenumber>

or - even easier - you can use p4 describe (see manual):

p4 describe -S <changenumber>

Find the changenumber with:

p4 changes -u <user> -s shelved

Best Answer

Related Solutions

The difference between “Rollback…” and “Back Out Submitted Changelist #####” in Perforce P4V

Showing a change in a shelved perforce file

Related Topic