1. p4 sync @
2. p4 edit //depot/a.c //depot/b.h
3. p4 sync
4. p4 resolve -ay
5. p4 submit
Of course, there can be mix and match. I CL#
the above set of operations will maintain the changes for c.txt and d.macro, which may be intended.
For more on the same topic refer to
http://kb.perforce.com/?article=014
No comments:
Post a Comment