Helix SwarmHelix Swarm
Loading...

br10.html

  • //
  • guest/
  • laura_wingerd/
  • perforce/
  • faq/
  • br10.html #1
  • View
  • Commits
  • Open Download .zip Download (2 KB) 
  1. <html>
  2. <head>
  3. <title>The Branching Papers -- Perforce FAQs</title>
  4. <head>
  5. <body bgcolor=#ffffff>
  6. <font size=-2><b><a href="branching.html#br10">[INDEX]</a></b></font>
  7. <p>
  8. <b>
  9. I backed a change out of one codeline, but I don't want to back it out
  10. of the codeline that's branched from it. Now, every time I integrate
  11. between the two codelines, Perforce wants to integrate the backing-out
  12. change. Is there a way to tell it not to?
  13. </b>
  14.  
  15. <blockquote>
  16. I assume you've backed out the change using the method describe in
  17. Tech Note 14, where you submit a change that puts files back to their
  18. old contents.
  19. You do have to integrate this backing-out change, but you can
  20. choose to "ignore" it. Consider this scenario:
  21. <ul>
  22. <p><li>
  23.   changelist 245 was originally submitted into //depot/main.
  24. <p><li>
  25.   //depot/main was integrated into //depot/branch
  26. <p><li>
  27.   @245 was backed out of //depot/main, and the change that did
  28.   that was @250.
  29. </ul>
  30. <p>
  31. The next time you integrate from //depot/main to //depot/branch,
  32. Perforce will want to propagate @250 -- that is, it will want to
  33. back the same change out of //depot/branch that it did out out
  34. //depot/main. Which is not what you want, in your case.
  35. <p>
  36. What you have to do now is integrate @250 from main to branch,
  37. using the <b>resolve</b> step to tell Perforce you want the
  38. the actual deltas to be ignored. Here's how: 
  39. <pre>
  40.   p4 integ //depot/main/...@250,@250 //depot/branch/...
  41.   p4 resolve -ay 
  42.   p4 submit
  43. </pre>
  44.  
  45. </blockquote>
  46. <p>
  47. <i>(March 1998)</i>
  48. <p>
  49. <font size=-2><b><a href="branching.html#br10">[INDEX]</a></b></font>
  50.  
  51. <hr>
  52. <h6>This is file $Id: //guest/laura_wingerd/perforce/faq/br10.html#1 $ in the 
  53. <a href="http://public.perforce.com/public/index.html">Perforce Public Depot</a></h6>
  54. </body>
  55. </html>
# Change User Description Committed
#1 83 Laura Wingerd The Branching Papers. 26 years ago