[p4] Can integrations work when files are renamed?

[Stephen Vance]

Sam --

You can do this with two integrations. The first one is

p4 integ -b main_to_project

which will bring the structural changes out from main to your project 
branch. The second one is

p4 integ project/file.c#2 project/src/file.c

which will merges your textual changes into the newly added file from 
the structural changes.

Steve

Sam Roberts wrote:
> I get the strong impression from Practical Perforce that it should be
> possible, but our local p4 admins aren't finding a way.
>
> I have a mainline with:
>
> 	main/file.c#1
>
> I branched to
>
> 	project/file.c#1
>
> then made changes, so I have:
>
> 	project/file.c#2 <- "mine"
>
> Meanwhile, the mainline was reorganized:
>
> 	main/src/file.c#1 <- "theirs"
>
> I wanted to get the changes from the mainline (obviously, much more
> changes than a single file) onto my project branch, so I can complete
> the project before merging back to the mainline. After integration from
> ///main to ///project, "mine" is gone, and I only have "theirs". What
> I want is the _location_ from the mainline, with my project changes
> merged in:
>
> 	project/src/file.c <- "theirs" + the changes on my branch for "mine"
>
> Never figured a way, gave up and left it to the more experienced p4
> users, they tried branch views, p4 integrate with specific reference to
> changesets and the specific source and target file, and other things,
> and eventually came to the conclusion its not possible without complex
> manual hacking about, which will be making it into our local p4 manual
> soon. Are they right, or is there a better way?
>
> Thanks,
> Sam
>
> p.s. by rename/move I mean the procedure described by "p4 help rename"
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>
>