Allow user to choose diff view when adding a Perforce integration changelist
When you use p4addchangelist to add differences from an integration to a review, Code Collaborator shows the differences between the merged file and the source or from branch.
We would prefer to see the diffs between the target or source branch and the merge, so we can see what has actually changed on the files we want to submit.
We can upload the view we want using
"addp4diffs //depot/...@change - 1 //depot/...@change"
but this doesn't work for pending changelists, and so is not compatible with the ensure-reviewed trigger.
I don't really want to use Perforce shelving for this. Would much prefer to have a switch on addchangelist to choose which diff view to upload, or even better (for us), a global or group-level "integration-view" admin property.
anonymous
shared this idea
3 comments
-
pwmedcraft
commented
This is fixed in CC version 5.0.5035 if you do:
ccollab set p4-ignore-integration-history yes
-
pwmedcraft
commented
Just to correct and clarify my original post, this line:
"We would prefer to see the diffs between the target or source branch and the merge"
should read
"We would prefer to see the diffs between the target or TO branch and the merge"
-
Yogi
commented
In fact, this should be the *default *behavior for addchangelist. If you want to add a flag then it should be to compare against the source branch. But the diff of the currently submitted target files vs. the resulting versions after integration is much more useful and thus should be the default behavior. The current behavior kind of useless.
