All geek questions in one place

How do I know which files I changed in the Perforce branch?

I have a sparse branch in Perforce that I regularly update with the main line of code. I would like a simple list of all the non-integration changes that were made to the branch to be ideally included in the new change list (to allow me to make the final code identifiers before merging back to the main line of code).

The only way I was able to do this was to simply integrate the branch back into the main line of code - the integration falls into the wash. I am not happy with this, though, since any changes I make will be made to the main line of code, and I would prefer to make them in the branch. I could create a third branch, but that just seems wrong.

Anyone have any better ideas?

+3
source share
2 answers

What is wrong with a simple demarcation of a branch against the main line of code?

+3
source

If you want to know changes in your branch that are not the result of integration and were not integrated back into the main line, you can do

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

Is this what you are looking for?

Enter

p4 help interchanges

for more information about this.

This is an undocumented feature of Perforce. See "P4 help undoc" for details.

+2
source

Source: https://habr.com/ru/post/1759420/

More articles:


All Articles