Helix SwarmHelix Swarm
Loading...

branching.html

  • //
  • guest/
  • hari_krishna_dara/
  • perforce/
  • faq/
  • branching.html #1
  • View
  • Commits
  • Open Download .zip Download (4 KB) 
  1. <head>
  2. <title>The Branching Papers -- Perforce FAQs</title>
  3. </head>
  4. <body bgcolor=#ffffff>
  5. <a name="top"></a>
  6. <h2>
  7. The Branching Papers
  8. </h2>
  9. <p>
  10. Contributed by Laura Wingerd
  11. <h3>
  12. Frequently (and Infrequently) Asked Questions
  13. about Branching, Integrating, Resolving,
  14. and Sundry 
  15. <a href="http://www.perforce.com">Perforce</a>-Related Topics
  16. </h3>
  17. <i>These are excerpted from my own email folder on branching.
  18. Some of these may be slightly out of date; my expertise 
  19. has evolved over time, and so has the Perforce product.
  20. But if you're trying to get a better understanding of how
  21. branching works, these notes may help.
  22. </i>
  23.  
  24. <h3>Branch Views</h3>
  25. <p>
  26. <ul>
  27. <p><li>
  28. <a name="br07"></a>
  29. <a href="br07.html">
  30. Why use branch views?
  31. </a>
  32. <p><li>
  33. <a name="br06"></a>
  34. <a href="br06.html">
  35. Is there a way to see what a branch view looked like in the past?
  36. Can this information be determined from "filelog" output?
  37. </a>
  38. </ul>
  39.  
  40. <h3>Integrating and Resolving</h3>
  41. <p>
  42. <ul>
  43. <p><li>
  44. <a name="br12"></a>
  45. <a href="br12.html">
  46. Is there a way to
  47. 'fake out' Perforce to tell it that a merge has already been done, or that
  48. it doesn't need to be done?
  49. </a>
  50.  
  51.  
  52. <p><li>
  53. <a name="br10"></a>
  54. <a href="br10.html">
  55. I backed a change out of one codeline, but I don't want to back it out
  56. of the codeline that's branched from it. Now, every time I integrate
  57. between the two codelines, Perforce wants to integrate the "backing-out"
  58. change. Is there a way to tell it not to?
  59. </a>
  60.  
  61. <p><li>
  62. <a name="br02"></a>
  63. <a href="br02.html">
  64. We tried to integrate a single change from one branch to
  65. another but in the resolve step we saw hundreds of deltas
  66. that weren't in this change. Why was this?
  67. </a>
  68.  
  69. </ul>
  70.  
  71. <h3>Handling Renamed Files</h3>
  72. <p>
  73. <ul>
  74. <p><li>
  75. <a name="br03"></a>
  76. <a href="br03.html">
  77.     I have a file I renamed in one branch. When I try to integrate
  78.     changes from that branch to another, Perforce insists on renaming
  79.     the same file in the target branch. How do I prevent that?
  80. </a>
  81. <p><li>
  82. <a name="br04"></a>
  83. <a href="br04.html">
  84. Why is Perforce so brain-dead when it comes to branching renamed files?
  85. </a>
  86. </ul>
  87.  
  88.  
  89. <h3>File Histories</h3>
  90. <p>
  91. <ul>
  92. <p><li>
  93. <a name="br08"></a>
  94. <a href="br08.html">
  95. What is this "filelog" output telling me?
  96. </a>
  97.  
  98. <p><li>
  99. <a name="br13"></a>
  100. <a href="br13.html">
  101. How do I find out which <i>changelists</i> (not <i>files</i>) need
  102. integrating from one branch to another?
  103. </a>
  104.  
  105. </ul>
  106.  
  107. <h3>Branching Strategies</h3>
  108. <ul>
  109. <p><li>
  110. <a name="br11"></a>
  111. <a href="br11.html">
  112. I read through the manual about branching, but I just can't figure out
  113. how to apply it to our daily build procedures here.
  114. Our old SCM system has a completely different branching model.
  115. How do I set up our builds to work with Perforce?
  116. </a>
  117.  
  118. <p><li>
  119. <a name="br01"></a>
  120. <a href="br01.html">
  121. We have a product that will be
  122. ported and released on HP and on Solaris. Should we branch
  123. //depot/main into
  124. //depot/variant-hp and
  125. //depot/variant-sol?
  126. And then should we branch off of those for each release?
  127. That seems like a lot of branches to maintain.
  128. </a>
  129.  
  130. <p><li>
  131. <a name="br05"></a>
  132. <a href="br05.html">
  133. Will be we able to integrate bug fixes from our development branch
  134. into the our QA branch without dragging new feature-specific changes
  135. along with them? It there a way to mark the new development changes
  136. so that they won't get integrated into the QA branch?
  137. </a>
  138.  
  139. <p><li>
  140. <a name="br09"></a>
  141. <a href="br09.html">
  142. We've got three related codelines we'd like to set up in Perforce,
  143. but our current SCM system is so hopeless we don't have any branch
  144. or integration history to convert. How can we make these three
  145. separate directory trees into related Perforce branches?
  146. </a>
  147.  
  148. </ul>
  149. </a>
  150. <p>
  151.  
  152. <p>
  153. <small><a href="#top">[TOP]</a></small>
  154.  
  155. <hr>
  156. <h6>This is file $Id: //guest/hari_krishna_dara/perforce/faq/branching.html#1 $ in the
  157. <a href="http://public.perforce.com/public/index.html">
  158. Perforce Public Depot</a></h6>
  159. </body>
  160. </html>
# Change User Description Committed
#1 5093 Hari Krishna Dara Populating perforce branch.
I will be adding p4admin files to it. 		20 years ago
//public/perforce/faq/branching.html
#1 112 Laura Wingerd Publish "Branching FAQ"
(pull in changes from //guest/laura_wingerd/perforce/faq/... ) 		26 years ago
//guest/laura_wingerd/perforce/faq/branching.html
#2 111 Laura Wingerd Put contributor attributions on FAQ pages. 26 years ago
#1 83 Laura Wingerd The Branching Papers. 26 years ago