[p4] Can integrations work when files are renamed?

[Colfer, Brian]

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
?
Since the move was an integration from .../main/file.c to
.../main/src/file.c  and a delete of .../main/file.c 

Perforce still knows what the base for the integration.

Now what if you split the file:

.../main/include/file.h  -> .../proj/include/file.h

Becomes
.../main/include/file1.h 
And 
.../main/include/file2.h 

But the project is still

.../proj/include/file.h


You fix a bug in proj and want to integrate it back to main. You can
stil do it with integrate in perforce.




-----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