[p4] RE: Integrating renamed files? - Chuck Karish - com.perforce.perforce-user

3 messages in com.perforce.perforce-user[p4] RE: Integrating renamed files?

From	Sent On	Attachments
Dennis Wheeler	09 Sep 2000 12:34
Kolarik, Tony	11 Sep 2000 05:50
Chuck Karish	11 Sep 2000 06:29

Subject:	[p4] RE: Integrating renamed files?
From:	Chuck Karish (kar...@bea.com)
Date:	09/11/2000 06:29:35 AM
List:	com.perforce.perforce-user

At 05:50 AM 9/11/00, Kolarik, Tony wrote:

I branched A to B and then moved (integrated) some files from one directory to another within B.

Now I want to integrate subsequent changes from A to B (w/o first -b integrating A). It seems that I will be recreating the moved files in the moved from directories rather than updating them in their new locations.

For example if I branched \\depot\foo\main\... \\depot\foo\offline\...

and then \\depot\foo\offline\dir1\a.cpp branches to \\depot\foo\offline\dir2\a.cpp

How about using a branch spec for your integrations? You

I am...

could define a branch spec that looks something like this: //depot/foo/main/... //depot/foo/offline/... //depot/foo/main/dir1/... //depot/foo/offline/dir2/...

This is incomplete. The moved files or directories are mapped twice, which will cause problems. Do this:

//depot/foo/main/... //depot/foo/offline/... -//depot/foo/main/dir1/... //depot/foo/offline/dir1/... //depot/foo/main/dir1/... //depot/foo/offline/dir2/...

That means I have to track down all the new and deleted directories, and actually I didn't just move whole directories. I moved individual files around within the existing directory tree too. Probably hundreds of them. Maybe there's some way to generate that with the diff command?

Run 'p4 describe -s' on all your changes, and look for files that were branched and deleted in the same change.

I was hoping for something canned since this seems like it would be a pretty common situation, but I didn't see it addressed directly in my scan of the tech notes. -- Tony K.

I don't know of a tool for that.