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?
What’s wrong with simply doing a diff of your branch against the main code line?