[p4] Fixing a release branch

[Brad Holt]

Just be careful that if you go with the forced integration from a past
point, you will have problems integrating up anything that had already
previously made it to that branch by mistake.  In other words, if the
day should come that you actually do need to get one of those changes
that you mistakenly integrated before, perforce will report back that
that revision has already been integrated (and I guess you would have to
force again).  Using the force-back will indeed bring the correct
content to your branch (reverting the content back to what you wanted),
however I have found that it does not truly "roll-back" the integration
history.  I was surprised by this behavior, but I reckon there's a good
reason for it.  I did some quick testing that seemed to prove this to
me, but if someone else has seen something different, I'd be happy to
know it.


-----Original Message-----
From: perforce-user-bounces at perforce.com
[mailto:perforce-user-bounces at perforce.com] On Behalf Of Russell Jackson
Sent: Friday, March 30, 2007 12:08 PM
To: Vander Werf, Bruce
Cc: perforce-user at perforce.com
Subject: Re: [p4] Fixing a release branch

Obliterate and rebranch is the best solution. The obliterate is just
cleaning up all references to that branch, so it is doing the correct
thing.

If you still don't want to do that, then you will have to use the -f
option
on the integrate to tell Perforce to ignore the previous integration
history
so that it will rebranch all of the files for you.

Rusty

On 3/30/07, Vander Werf, Bruce <bvanderwerf at crownintl.com> wrote:
>
> We branched our main codeline as a release branch, only to realize
that
> we had included changes made since the point of release. I would like
to
> do this again at an earlier point (changelist), but I'm not sure the
> best way to do this.
>
> I can obliterate the bad branch, but I am worried about side effects.
> When I tested this, the report was 'Would delete 594 client 594
> integration 297 revision records.' There have been no revisions to the
> branch, so I'm concerned about what this actually deleting.
>
> I tried deleting the bad branch. When I tried then to renintegrate at
> the proper point, it simply returned:
>
>     //depot/blah/blah/... at 896 - all revision(s) already integrated.
>
>
> What's the best solution here?
>
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>



-- 
--------------------------------------------------
RCJackson Consulting
Perforce Consulting Partner and Certified Trainer
--------------------------------------------------
rusty at rcjacksonconsulting.com
http://www.rcjacksonconsulting.com
tel: 512-535-7274
fax: 512-535-7322
--------------------------------------------------
_______________________________________________
perforce-user mailing list  -  perforce-user at perforce.com
http://maillist.perforce.com/mailman/listinfo/perforce-user