6 messages in com.perforce.perforce-user[p4] Correcting integration errors in...
FromSent OnAttachments
Williams, Kenneth (Ken) (TLR Corp)14 Sep 2004 09:42 
Stephen Vance14 Sep 2004 10:50 
Michael McTernan14 Sep 2004 11:02 
Stephen Vance14 Sep 2004 11:33 
Ken Wilson14 Sep 2004 11:38 
Dave Lewis14 Sep 2004 12:37 
Subject:[p4] Correcting integration errors in a branch
From:Stephen Vance (ste@vance.com)
Date:09/14/2004 10:50:11 AM
List:com.perforce.perforce-user

You could obliterate. That's effectively pretending the mistake never existed.

You could also do 'p4 integ -f -s @versionsyoureallywant' and just 'resolve -at' substituting the correct revision specifiers.

Steve

At 12:43 PM 9/14/2004, Williams, Kenneth \(Ken\) \(TLR Corp\) wrote:

Hi,

A few days ago I created a release branch //depot/release/foo/2.2/ for one of our code lines. Soon afterward a developer pointed out that I put the wrong versions of things into the branch - some versions of things are too high, some things are missing altogether (it got whatever happened to be in my client at the time). So now I need to correct the branch.

What's the best strategy for fixing this? Time to get out the obliteration sword? I've never had to do that before...

-Ken