[p4] Fixing a Branch to Reflect an Earlier Release

[John Hopkins]

IMO, the best way to resolve this is to obliterate the incorrect
change and re-integrate using the correct donor branch change number.

Otherwise, you may run into problems when others merge down from the
release branch.  For example, hand-deleted files will show up as
pending integrates to consumers of the release branch.

John


> -----Original Message-----
> From: perforce-user-bounces at perforce.com
> [mailto:perforce-user-bounces at perforce.com] On Behalf Of Vander Werf, Bruce
> Sent: Wednesday, February 21, 2007 8:27 AM
> To: perforce-user at perforce.com
> Subject: [p4] Fixing a Branch to Reflect an Earlier Release
> 
> 
> We have a situation here where a release branch was created based on the
> latest revision in the main codeline, but it should have been created on an
> earlier revision. How can I repair this so that the release branch reflects
> the correct revision? 
>  
> I tried integrating that revision from the main branch to the release
> branch, but it reported that the revision had already been integrated. 
>  
> Can I use obliterate to just destroy the branched revision and re-integrate?
>  
> -Bruce

-- 
John Hopkins
Build Engineer, Sophos
Sophos - security and control