[p4] Integ Across Multiple Branches
Robert Cowham
robert at vaccaperna.co.uk
Thu Apr 17 02:39:59 PDT 2008
> Is there a way to integrate a single Changelist across
> several branches at once? It seems like there was a thread
> on this in the past but I could not find it. I made a Submit
> into main with Changelist 35431...build locally and unit
> tests pass and now I want to propagate only my changes across
> two branches (1.0 and 2.0). I would like to accomplish this
> without extra languages or utilities installed on each
> developer PC if possible. Calling a bat file from a Tool
> menu that runs the P4 integ command would be perfect if I
> could get the syntax correct.
> Trying to go from one branch to another works fine so I tried
> to add a second branch by just adding it to the same line and
> I get the following error.
>
> C:\>p4 integrate -o //IntegrateTest/main/... at 35431
> //IntegrateTest/1.0/... //IntegrateTest/2.0/...
> Usage: integrate [ -c changelist# -d -D<flag> -f -h -i -o -n
> -r -s from -t -v ] [ -b branch to... | from to ]
> Missing/wrong number of arguments.
>
Just to note that there is a difference between:
p4 integrate -o //IntegrateTest/main/... at 35431 //IntegrateTest/1.0/...
Which takes everything up to the changelist.
p4 integrate -o //IntegrateTest/main/... at 35431,35431
//IntegrateTest/1.0/...
Which takes the single changelist.
Robert
More information about the perforce-user
mailing list