[p4] interaction between renamed files and merging - Dan Kegel - com.perforce.perforce-user

6 messages in com.perforce.perforce-user[p4] interaction between renamed file...

From	Sent On	Attachments
Ollie Wild	23 Dec 2002 17:27
Dan Kegel	23 Dec 2002 21:03
Stephen Vance	24 Dec 2002 03:39
Dan Kegel	24 Dec 2002 04:37
Ollie Wild	24 Dec 2002 09:10
Stephen Vance	24 Dec 2002 10:48

Subject:	[p4] interaction between renamed files and merging
From:	Dan Kegel (da...@kegel.com)
Date:	12/23/2002 09:03:02 PM
List:	com.perforce.perforce-user

Ollie Wild wrote:

I have a question about file renaming and merged branches. My company has a perforce setup consisting of a single main line and multiple branches below this for the various functional groups. It looks something like this:

main branch / | \ / | \ branch A branch B branch C

Suppose I rename a file (using integrate and delete) in branch A. At the same time, someone else edits the file in branch B.

When we merge branch A and branch B back into the main line, what happens? In particular, will the edits to old_file in branch B be applied to new_file, or will they be silently discarded?

My understanding is: the first guy to merge gets his changes in unconditionally. The second guy to merge either gets his changes in if they don't conflict, or his is notified immediately of the exact conflicts, and has to resolve them before any of his changeset takes effect.

This is as far as I know exactly the same mechanism as is used to resolve the case where two guys are working on the same branch but with different clients. (In fact, there might be no difference at all, since merging in from branches is done via your client workspace, isn't it?) - Dan