Can a changelist only contain one file which is part of a larger branch?

Question

This is what I have done:

1. Branch from trunk (v 1.0.0)
2. Create new branch (v 1.0.1) 2.1 - with the creation of a branch about 50 files were requested
3. Finalized changes, the change only needed to happen on 1 file
4. --- here is where I want to optimize my work

On my first pass I merged all files and I asked Perforce to keep my newest copy of all the files even tho they didn't change. So my question is.

When I merge back, if I tell Perforce to keep the originals that didn't change does that mean that my change list will only contain one file which is the one that changed? Or when I create my branch the first time I have to only branch the one file that I will be updating. Of course that would be hard to know ahead of time.

Answer 1

Apparently the process was correct and the optimization was not necessary. However it is important to note that when you are merging you can opt-out contents that haven't changed.