Loading...
Helix SwarmHelix Swarm
Loading...

br12.html

  • //
  • guest/
  • laura_wingerd/
  • perforce/
  • faq/
  • br12.html #2
  • 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#br12">[INDEX]</a></b></font>
  7.  
  8. <p>
  9. <b>
  10. A developer changed a bunch of files in our main branch. Then he went
  11. and submitted the identical change to a child branch, '0.95p'. 
  12. So, the problem is that 'p4 integrate' on the child branch says that
  13. all those files need merging, but they really don't.  So, is there a way to
  14. 'fake out' Perforce to tell it that the merge has already been done, or that
  15. it doesn't need to be done? 
  16. </b>
  17. <blockquote>
  18. Yes, you can use <b>p4 resolve</b> to fake out Perforce. (Not really a fake-out,
  19. just a matter of letting Perforce know it can ignore a particular integration.)
  20. <p>
  21. In the <b>resolve</b> step you have a choice of 'am', 'at', or 'ay' (meaning
  22. 'accept merged', 'accept theirs', or 'accept yours'). If you choose 'ay',
  23. the target file will not be altered in your workspace. When you submit a file
  24. resolved this way, the target file will not be altered in the depot either, but 
  25. an integration record will be created so that subsequent <b>p4 integrate</b> 
  26. commands will not try to integrate the same change again.
  27. <p>
  28. So say the 'main' branch and the '0.95p' branch were all integrated with
  29. each other. Then Bob, say, submits change 420 to the '0.95p' branch, and then
  30. submits the identical modifications as change 421 to the 'main' branch. To
  31. do the mock integration:
  32. <pre>
  33.    p4 integ //depot/0.95p/...@420,420 //depot/main/...
  34.    p4 integ //depot/main/...@421,421 //depot/0.95p/...
  35.    p4 resolve -ay
  36.    p4 submit
  37. </pre>
  38.  
  39. </blockquote>
  40.  
  41. <p>
  42. <i>(January 1999)</i>
  43. <p>
  44. <font size=-2><b><a href="branching.html#br12">[INDEX]</a></b></font>
  45.  
  46. <hr>
  47. <h6>This is file $Id: //guest/laura_wingerd/perforce/faq/br12.html#2 $ in the 
  48. <a href="http://public.perforce.com/public/index.html">Perforce Public Depot</a></h6>
  49. </body>
  50. </html>
# Change User Description Committed
#2 86 Laura Wingerd correct an example in the branching papers 26 years ago
#1 83 Laura Wingerd The Branching Papers. 26 years ago