How do I find out which files I've changed in Perforce branch?

Question

I've got a (sparse) development branch in Perforce which I keep up to date regularly with the main code line. I'd like a simple way to list all the non-integration changes which have been made to the branch, ideally checked out into a new changelist (to allow me to do final code-tidyups before merging back to the main code line).

The only way I've been able do this is to simply integrate the branch back to the main code line - the integrations fall out in the wash. I'm not happy with this though as any changes I make will be made into the main code line and I'd actually prefer to make these in the branch. I could obviously create a third branch, but that just seems wrong.

Anyone got any better ideas?

Answer 1

What's wrong with simply doing a diff of your branch against the main code line?

Answer 2

If you want to find out changes in your branch that are not the results of integration and have not been integrated back into the main line, you can do

p4 interchanges branch_directory/... main_dir/....

Is this what you are looking for?

Type

p4 help interchanges

for more info on this.

This is an undocumented feature of Perforce. See 'p4 help undoc' for more.