[p4] Can integrations work when files are renamed?

[Sam Roberts]

On Thu, Jun 15, 2006 at 07:31:09PM -0600, Colfer, Brian wrote:
> What if you changed your branch view spec from 
> //depot/something/main/file.c //depot/something/project/file.c
> to
> //depot/something/main/src/file.c //depot/something/project/file.c
> ?

Tried that, but it means that in my branch I have the "old" location for
file.c, but that isn't what I want. I want the file moved, but I
want my local changes to go with it.

So, on the trunk some changes were made to file.c, I want them applied
to the project copy. Then on the trunk file.c was moved, I want that
move applied to my project copy. Etc.

In other words, I want the changes made on the trunk applied to my
branch (thats what I think of as "merge").

Maybe with a more complex branch view? I was hopeful this might work:
  //depot/main/... //depot/project/...
  //depot/project/file.c //depot/project/src/file.c

But, no luck.

Cheers,
Sam

> -----Original Message-----
> From: perforce-user-bounces at perforce.com
> [mailto:perforce-user-bounces at perforce.com] On Behalf Of Sam Roberts
> Sent: Thursday, June 15, 2006 3:29 PM
> To: perforce-user at perforce.com
> Subject: [p4] Can integrations work when files are renamed?
> 
> 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