[p4] re-integrate post roll-back

[David Weintraub]

Have you've tried the "undocumented" "p4 interchanges" command to see
what Perforce thinks has already been integrated? (The "p4
interchanges" command is documented via "p4 help undoc").

>From there, you may be able to work out getting the two branches in
sync with each other. For revisions that have already been integrated,
you can use the "p4 integrate -f" to force a new integration using
revision ranges. For revisions that have been accounted for, but not
integrated, you can use "p4 integrate" without the "-f" flag, and
simply not accept the changes from the other branch. You can also give
a range of revisions to integrate too.

I think your best bet is to get to the point where "p4 interchanges"
insist that no further integrations need to be done. You can simply do
a "p4 resolve -ay" to prevent any actual changes from taking place.

Once you get "p4 interchanges" to say that no more integrations are
needed, you can then use "p4 integrate -f
<file>#<fromChangeList>,<toChangeList> to actually merge the changes
over in the range <fromChangeList> to <toChangeList>, and that will
allow you to integrate step by step as you wanted. Once you get
everything caught up, you'll be able to do regular integrations
without further troubles.

On 12/10/06, Andrew Houghton <aah at roarmouse.org> wrote:
> Thanks to tech note #14, I managed to roll back a disastrous
> integration of our main branch into a very long-running dev branch --
> I calmly accepted a wide range of merges that, in retrospect, I
> should have realized were insane.
>
> But now I'd like to re-integrate, and do it carefully -- the original
> problem was partially caused by waiting too long between
> integrations, so this time I'd like to do it in smaller time slices.
> Ideally, I'd like a way to integrate code from the main branch at a
> particular point in time into the dev branch as it now stands; i.e.,
>
> p4 integrate -b devbranch @<some change number>
> ...
>
> p4 integrate -b devbranch @<some larger change number>
> ...
>
> p4 integrate -b devbranch @<some even larger change number>
> ...
>
> p4 integrate -b devbranch
> ...
>
> .. the problem being that I can't see how to do that, given that the
> devbranch believes it's already integrated those changes (a naive use
> of -f and -s doesn't seem to do what I want).
>
> Hopefully that made sense.
>
> Any hints?
>
> Thanks,
>
> Andrew
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>


-- 
--
David Weintraub
qazwart at gmail.com