[p4] Fixing a release branch

[Russell Jackson]

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