P4 shelve of commited files

Question

Is there any option to shelve files that have been once commited? I need to expose them for a codereview. I've tried to fetch old versions and shelve them to produce something like back-diff, however it doesn't work for me: although files in shelve are old one, diff in P4V thinks they're identical to new ones.

Answer 1

No. The files have been committed.

You want to back out the changelist, shelve that changelist, then back out the changelist again and submit to restore the depot to the state before you submitted.

How to do this

1. In P4V, select the 'Submitted Changelists' tab (View > Submitted Changelists) and find the changelist. Right-click the changelist and select 'Back Out Submitted Changelist ###'. It will prompt you create a new pending changelist.

2. In the 'Pending Changelist' tab (View > Pending Changelists), shelve the new changelist you just created.

3. Repeat step 1, creating a new pending changelist.

4. Submit.

Answer 2

You can diff a submitted changelist against the depot at a previous state. In your history tab, (View -> History in Menu Bar), select the changelist of interest. Drag the changelist onto the previous changelist number (be sure you have the top level of your depot/workspace selected, or at least a high enough point to include all your changes). This will open up a dialog which will be a type of directory diff which will show all the changed files. Use the arrows in the toolbar to move between changed files. Use the drag and drop and drag the old file onto the new one to see the changes between the files.

With the command line you can also do this: let's pretend your changelist is 1300

p4 diff2 ...@1299    ...@1300

but this uses the text-only 'diff'.