How does one diff between two pending changelists in perforce?

Question

I have a couple of similar pending changelists based on top of a branch of code and off the same workspace in perforce. I need to diff between them and (eventually) merge them together into one changelist. What is the fastest and simplest way to go about it? I would rather avoid creating a temporary branch.

Answer 1

Recent versions of the server support unshelving a change into a workspace with opened files, and resolving the merge.

So, assuming your server is recent enough, you simply:

1. Shelve the changes
2. Start with a clean workspace
3. Unshelve one of the changes into that workspace
4. Unshelve the other change into the same workspace
5. Resolve any merged changes that result.
6. Carefully examine your diffs prior to submit, to ensure you have the changes you desire.