[Mondrian] RE: Mondrian branch & release process

[John V. Sichi]

Julian Hyde wrote:
> To integrate from a branch as of a particular change, you do something like
> this:
> 
> p4 change
> 
> (creates a new change list numbered xxxxx)
> 
> p4 integrate -c xxxxx -b mondrian_dev_to_release_3.0 -t -s
> //open/mondrian/... at 11016 //open/mondrian-release/3.0/...
> 
> (This was the command I used just now.)

Also need p4 resolve -am here before submit (and deal with any conflicts).

To cherry-pick a single changelist (e.g. 11093) in isolation (leaving 
off stuff that came before):

p4 integrate -t -b mondrian_dev_to_release_3.0 @11093, at 11093

It's actually a range expression (where a point is represented as the 
same start/end), so you can do

p4 integrate -t -b mondrian_dev_to_release_3.0 @11093, at 11098

to integrate 11093, 10094, 10098 at once.

You can combine disjoint ranges all in the same workspace by issuing the 
integrate command multiple times with different ranges.

Then once you've got what you want, p4 resolve -am, deal with conflicts, 
build, test, fix, etc.

If you run into trouble, Rushan is an expert on this one now.

JVS