br10.html #1 

<html>
<head>
<title>The Branching Papers -- Perforce FAQs</title>
<head>
<body bgcolor=#ffffff>
<font size=-2><b><a href="branching.html#br10">[INDEX]</a></b></font>
<p>
<b>
I backed a change out of one codeline, but I don't want to back it out
of the codeline that's branched from it. Now, every time I integrate
between the two codelines, Perforce wants to integrate the backing-out
change. Is there a way to tell it not to?
</b>

<blockquote>
I assume you've backed out the change using the method describe in
Tech Note 14, where you submit a change that puts files back to their
old contents.
You do have to integrate this backing-out change, but you can
choose to "ignore" it. Consider this scenario:
<ul>
<p><li>
  changelist 245 was originally submitted into //depot/main.
<p><li>
  //depot/main was integrated into //depot/branch
<p><li>
  @245 was backed out of //depot/main, and the change that did
  that was @250.
</ul>
<p>
The next time you integrate from //depot/main to //depot/branch,
Perforce will want to propagate @250 -- that is, it will want to
back the same change out of //depot/branch that it did out out
//depot/main. Which is not what you want, in your case.
<p>
What you have to do now is integrate @250 from main to branch,
using the <b>resolve</b> step to tell Perforce you want the
the actual deltas to be ignored. Here's how: 
<pre>
  p4 integ //depot/main/...@250,@250 //depot/branch/...
  p4 resolve -ay 
  p4 submit
</pre>

</blockquote>
<p>
<i>(March 1998)</i>
<p>
<font size=-2><b><a href="branching.html#br10">[INDEX]</a></b></font>

<hr>
<h6>This is file $Id: //guest/michael_roach/perforce/faq/br10.html#1 $ in the 
<a href="http://public.perforce.com/public/index.html">Perforce Public Depot</a></h6>
</body>
</html>
# Change User Description Committed
#1 1424 Michael Roach Creating initial guest branch of perforce\faq\...
//public/perforce/faq/br10.html
#1 112 Laura Wingerd Publish "Branching FAQ"
(pull in changes from //guest/laura_wingerd/perforce/faq/... )
//guest/laura_wingerd/perforce/faq/br10.html
#1 83 Laura Wingerd The Branching Papers.