[p4] Branches - rename and integrations
rickmacd at shaw.ca
Fri Jul 10 07:00:44 PDT 2009
Are all these renames part of your defined workflow, or are they all
just trying to fix errors that you will make sure never happen again?
Kamlesh Mutha wrote:
> [Resending this email since last one got sent under another thread]
> I need some help on the following scenario:
> 1. There was a branch *//depot/rel/1.5.002_xyz/…*
> 2. Following changelists were checked in on this branch:
> Change 20981 on 2009/06/15
> Change 20226 on 2009/06/05
> Change 20205 on 2009/06/05
> 1. This branch was renamed to *//depot/rel/1.5.003/…* through P4V using
> “Move/Rename” option (which integrates the contents on new branch and
> deletes the contents from older branch)
> 2. Here is the list of changelists checked in on this new branch
> Change 23182 on 2009/07/08
> Change 23117 on 2009/07/08
> Change 22806 on 2009/07/03
> Change 22781 on 2009/07/03
> 1. Now I need to ensure that all these changelists are integrated
> properly to *//depot/rel/1.5-R/…* branch, which is a parent branch for
> the above mentioned branches.
> 1. When I do a *p4 interchanges //depot/rel/1.5.002_xyz/...
> //depot/rel/1.5-R/..., *I don’t see changelist 20226 in the report which
> means perforce thinks it has already been integrated. However, I neither see
> any such integration changelist nor the changes submitted through this in
> the target branch. Why could that be? Is rename causing any issue or Am I
> missing something?
> 2. Is *p4 integ //depot/rel/1.5.003/… //depot/rel/1.5-R/…* sufficient?
> Would it also ensure that changes submitted before rename also get
> 3. What is the best way to complete such integration and ensure that all
> the contents are properly integrated into the target branch?
> 4. Now there is a requirement that *//depot/rel/1.5.003/…* to be renamed
> to something else and new *//depot/rel/1.5.003/…* branch to be created
> from the parent. How should it be done?
> Thanks and Regards,
More information about the perforce-user