Re: [p4] Missed Integration
briand <[email protected]>
| Newsgroups | gmane.comp.version-control.perforce |
|---|---|
| Message-ID | <[email protected]> |
Posted on behalf of forum user 'briand'. Here are a couple of suggestions that help me when I'm managing bulk integrations: - Make sure to do the integration in a clean/empty workspace. If files are open for edit, that can cause surprises. If files have been added or modified outside of Perforce, that can cause surprises. To avoid these surprises and to eliminate yet another item that I need to double-check, I use dedicated workspaces for my bulk integrations. - Make sure the client doing the integration has SubmitOptions set to submitunchanged. If I'm doing an integration, I don't want to have to think about if the integration caused the file to change or not. I just want the integration to happen. If SubmitOptions is set to revertunchanged to leaveunchanged, then I may not get all the changes integrated (in particular, those changelists that did not change the file or its attributes). - Avoid mixing single change integrations with integrations of all changes up to change X. In fact, I try to avoid single change integrations as much as possible. I've had to clean up too many problems caused by engineers integrating change X+1 before integrating change X. In addition to the revision graph that Sambwise mentioned, I also use p4 interchanges -f to give me more information about what is causing my integration problems. -- Please click here to see the post in its original format: http://forums.perforce.com/index.php?/topic/5528-missed-integration _______________________________________________ perforce-user mailing list - [email protected] http://maillist.perforce.com/mailman/listinfo/perforce-user