i have created feature branch 1 of our projects, , deleted documentation files there in 1 changelist. (i know, bad idea).
i want integrate except given changelist, tried following ignore it:
p4 integrate //branch/...@cl,cl //main/... p4 resolve -at //main/... however, files still remain marked deletion - resolve ends
//main/... - no file(s) resolver. is there way how tell perforce given cl integrated , ignore in subsequent integrations?
note need @ least 2011.1 server (if server older you'll error message on integrate):
p4 integrate -rd //branch/...@cl,cl //main/... p4 resolve -ay the "-rd" flag says files opened delete automatically should opened integrate , scheduled resolve instead. in turn, "p4 resolve -ay" want keep what's in your workspace (an "integrate" no content change) , submit final result.
the submitted "integrate" revisions record have done integration (the history show "ignore" of deleted revisions in branch), without changing contents of submitted files.
if use "p4 merge" command instead of "p4 integrate" command (with more current server version, think 2013.1 or thereabouts), files scheduled resolve automatically (i.e. including have been automatically opened branch or delete), "p4 merge" must resolve (and may optionally ignore) source change.
relevant p4 blog entries:
Comments
Post a Comment