[p4] Integrate and Edit - what is good practice and why?

Ildefonzo Arocha ilde.web at gmail.com
Thu Aug 9 09:06:16 PDT 2007


Hi there,

New P4 user here.

If you would to branch a file and then make some changes, what is
considered best practice and why?:

p4 integrate //depot/main/foo.c //depot/v1/foo.c
p4 submit
p4 edit //depot/v1/foo.c
p4 submit

-or-

p4 integrate //depot/main/foo.c //depot/v1/foo.c
p4 edit //depot/v1/foo.c
p4 submit

In the first case p4 filelog reports:
//depot/v1/foo.c
... #2 change 40 edit on 2007/08/09 by iar at iar (text) 'Test 2 '
... #1 change 39 branch on 2007/08/09 by iar at iar (text) 'Test '
... ... branch from //depot/main/foo.c#1

In the second case p4 fielog indicates:
//depot/v1/foo.c
... #1 change 41 add on 2007/08/09 by iar at iar (text) 'Test 2 '
... ... branch from //depot/main/foo.c#1

Funny though, P4V reports in the second case 'add'.

Besides the obvious difference of doing an extra step like on the
first case.  What are the Pros and Cons of doing it one way or the
other?  Does it make any difference for p4 interchanges?  Will I have
any possible problems/restrictions/limitations of I tell my users to
edit their newly branched files without needing to submit them first
(like in the second case)?

Thanks,
Ildefonzo



More information about the perforce-user mailing list