Re: [p4] Merging new files from release (source) stream into mainline (target)
Sambwise <[email protected]>
| Newsgroups | gmane.comp.version-control.perforce |
|---|---|
| Message-ID | <[email protected]> |
Posted on behalf of forum user 'Sambwise'. Reading over the list of steps more carefully, I think what's going on is that by going through the dialog where you pick changelists individually you're getting P4V to run the equivalent of: p4 merge --from release_stream@=firstChange p4 merge --from release_stream@=secondChange p4 merge --from release_stream@=thirdChange etc, which is kind of a terrible workflow since you're setting up resolves that all kind of depend on each other while also forcing them all to potentially happen independently. The resolve logic can handle some of those state transitions gracefully, but if you just tell the server you want to merge a range of changes rather than individually telling it about each one exclusively of the others, it can make the process a lot easier by just combining them into a single action. P4V should IMO be doing this for you by noticing that you picked a contiguous range of changelists and just running a single merge command for you, but if wishes were fishes we'd all swim in riches. I think the best way to resolve this is going to be to use a different filter option on that dialog and make it explicit that you want to merge a range, not a hand-picked set of changes. If you *do* need to do a hand-picked set of changes, I'd recommend not doing them all at once if they touch the same files -- do one change (or a one set of changes that touch different files), resolve, submit (ideally), then go on to the next. Having the files already submitted (or at least already resolved with the previous set of changes accounted for) should make things go a bit smoother. -- Please click here to see the post in its original format: http://forums.perforce.com/index.php?/topic/5517-merging-new-files-from-release-source-stream-into-mainline-target _______________________________________________ perforce-user mailing list - [email protected] http://maillist.perforce.com/mailman/listinfo/perforce-user