Hi,

I am facing the following situation: We are begging a V2.0 project, which is mostly based on source files from V1.0. However, files from V1.0 are branched to V2.0 in a non-trivial manner: Each file changes it's directory (And sometimes it's name) in an individual manner. For example: V1.0/foo/bar.cpp -> V2.0/choco/milk/bar.cpp V1.0/some/where.cpp -> V2.0/over/the/rainbow.cpp

And so on. The reason for this is that we are using this branch as an opprtunity to order the files in a new hierarchy.

My concern is that in a few months, when we will want to merge all bug fixes done in V1.0 into V2.0, there will be no methodological way to do it. I am performing this branching by using 'integrate -> Using filespec' for each file (Or a group of files) seperately, so Perforce has the knowledge about which file in V2.0 came from which V1.0 file, however I do not know of any methodological method of instructing perforce to merge V1.0 changes into V2.0 based on the original source of the branch for each file individually.

I thought about maintaining a long branchspec which would have a line for each file, mapping it from V1.0 to the proper place in V2.0. This will solve the problem, as this branchspec can be used many times with a single command. However, creating this branchspec seems like a manual, error-prone job.

Any better ideas ?

Thanks, Oren.