[p4] Help with Labels and Integration
Robert Cowham
robert at vaccaperna.co.uk
Wed Oct 18 02:11:51 PDT 2006
Hi Keri-Lyn
If I were you I would change what you are doing slightly to fit in with how
Perforce is designed to do branching:
- developer creates "initiative branch" by branching *everything* from
Current_Production
- developer makes changes, labels whole branch, goes to QA etc.
- integrate back everything up to and including the label to
Current_Production
Do this in p4v 2006.1 by:
Right clicking branch spec (you did create one of these for the branch
didn't you), Integrate using...
Under options you may wish to tick "Reverse" depending on direction of
branch spec
Under "Limit Revision Range", tick "End" change dropdown to label and either
type in or browse for label.
Click integrate and then resolve as normal.
QED - quite easily done as my Maths teacher used to say (not the Latin
teacher!)
Robert
P.s. Your proposal to only branch files developer plans to change isn't how
Perforce is designed to work. It is possible, but makes life harder if he
suddenly realises that he needs to change (and thus branch) yet another
file. Let Perforce's merge tracking to the work for you instead.
> Here's the deal - we are restructuring our Perforce
> development process, by going with a mainline/branching
> model. We have a "Current_Production" branch, and for each
> initiative, creating another branch (of just the files that
> are changing) - Ok - so in the "initiative branch", a
> developer does his work, labels it, it goes to QA based on
> the label, he makes changes, he creates a new label, new
> label goes to QA...
>
>
>
> We decided when it's time for the production installation (we
> have a production environment we update, not new builds or
> CD's going to customers), we would take the contents of the
> tested/passed QA/locked label and integrate back into the
> Current_Production branch, BASED ON THE LABEL.
>
>
>
> Is there any way to integrate using the label as the source?
>
>
>
> Any help would be greatly appreciated.
>
>
>
> Keri-Lyn Mullis
>
> Release Engineer
>
>
>
>
>
> *This e-mail and any attachments may contain content
> protected under federal law and is also confidential and
> proprietary in nature.
> If you received this message in error, please notify the
> sender immediately and delete the original and destroy all
> copies of the message and any attachments. Any other use of
> this e-mail by you including retaining, using, copying,
> distributing, or otherwise disclosing this information in any
> manner is prohibited.
>
> _______________________________________________
> perforce-user mailing list - perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>
>
More information about the perforce-user
mailing list