Forum Discussion

aazarian's avatar
aazarian
Occasional Visitor
4 years ago
Solved

integrate all change lists at once

I have three different perforce clients as below and in each of them I have some change lists files. If I add all change lists into the code collaborator review, it will add these 3 clients and their changes which repeats the files if they have shared files and thus it would be very confusing for the reviewer to understand the history of each file (e.g., one file was changed in client A and did not changed in Client B and changed again in Client C);

What is the best way to create a code collaborator review which includes all changes and if the reviewer click on any file, it would be able to see the history of the file diffs, without having the info of their client (to ease tracking each file). 

client A:
 - change-list #1

 - change-list #2

 - change-list #3

 

client B:

 - change-list #1

 - change-list #2

 

Client C:

 - change-list #1

 - change-list #2

 - change-list #4

 - change-list #5

  • Hello aazarian,

     

    By design, if a numeric Perforce change list was uploaded to Collaborator, Collaborator will detect the history of changed files by executing the p4 describe -c number_of_changelist command and will upload each affected file in a separate change list (a container) to a review. Thus, in the review, you will see each version of the file that came from different changelists. For such reviews, the reviewer can view the uploaded files using the "Separate" view mode. This view shows each uploaded change list separately and if a file was clicked in this mode, the Diff Viewer will open the file versions that were uploaded within this change list only. So, this should help the reviewer to understand what changes were done in each change list without having them to navigate between the file versions manually. 

    https://support.smartbear.com/collaborator/docs/reference/ui/review-screen/review-materials.html - "View as"

     

    Also, you can try to use the "Add Perforce Diffs" feature instead. This feature will generate diffs between the given range of dates, change list IDs, or branches and uploads only the generated diffs and not the files themselves. Read more here:

    https://support.smartbear.com/collaborator/docs/source-control/perforce.html#ways-of-integration - "Add Perforce Diffs"

1 Reply

  • OlegB's avatar
    OlegB
    SmartBear Alumni (Retired)

    Hello aazarian,

     

    By design, if a numeric Perforce change list was uploaded to Collaborator, Collaborator will detect the history of changed files by executing the p4 describe -c number_of_changelist command and will upload each affected file in a separate change list (a container) to a review. Thus, in the review, you will see each version of the file that came from different changelists. For such reviews, the reviewer can view the uploaded files using the "Separate" view mode. This view shows each uploaded change list separately and if a file was clicked in this mode, the Diff Viewer will open the file versions that were uploaded within this change list only. So, this should help the reviewer to understand what changes were done in each change list without having them to navigate between the file versions manually. 

    https://support.smartbear.com/collaborator/docs/reference/ui/review-screen/review-materials.html - "View as"

     

    Also, you can try to use the "Add Perforce Diffs" feature instead. This feature will generate diffs between the given range of dates, change list IDs, or branches and uploads only the generated diffs and not the files themselves. Read more here:

    https://support.smartbear.com/collaborator/docs/source-control/perforce.html#ways-of-integration - "Add Perforce Diffs"