[Mondrian] RE: Mondrian branch & release process

[Julian Hyde]

> Will Gorman wrote:
>
> I've checked out //open/mondrian-release/3.0 following your
> instructions, I updated my p4 client, and did a sync
> on //open/mondrian-release/3.0.  Do I need to do something 
> special with
> the sync?  The command I entered was "p4
> sync //[myclient]/mondrian-release-3.0/...", and it looks like the
> branch is at the latest revision vs. 11016 (the ivy files are present,
> etc).

My mistake. I integrated too much of the history over to
//open/mondrian-release/3.0. Fixed in change 11205.

> Do I need to execute a similar p4 sync //... at 11016 command 
> like you did
> in setting up the branch?
> 
> This may be the reason why my integrate commands are also not working,
> but I wanted to verify the syntax, when trying to merge change 11017
> with the branch:
> 
> "p4 integrate -n -c 11017 -b mondrian_dev_to_release_3.0"
> 
> At the moment this returns "Change 11017 is already 
> committed.", but I'd
> expect it to update the related changelist files to that version.

The '-c' flag tells perforce what changelist to put the integration records
into. That change list then needs to be committed. Perforce correctly
doesn't let you put those integration records into a changelist that has
already been committed.

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.)

p4 submit -c xxxxx

To edit code on the branch, you just need to set your client's view to
include the branch, then sync to the latest revision.

Julian