Helix SwarmHelix Swarm

br13.html

  • //
  • guest/
  • laura_wingerd/
  • perforce/
  • faq/
  • br13.html #1
  • View
  • Commits
  • Open Download .zip Download (1 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#br13">[INDEX]</a></b></font>
  7. <p>
  8. <b>
  9. How do I find out which <i>changelists</i> (not <i>files</i>) need
  10. integrating from one branch to another?
  11. </b>
  12. <blockquote>
  13. You can compare the outputs of the <b>p4 changes -i</b> command.
  14. For example:
  15. <pre>
  16.         p4 changes -i //depot/target/... > output1
  17.         p4 changes -i //depot/source/... > output2
  18.  
  19.         diff output1 output2
  20. </pre>
  21. Changelists in output2 that aren't also in output1 are 
  22. candidates for integration. However, be aware that if <i>any</i>
  23. file revision associated with changelist <i>n</i> was integrated from 
  24. //depot/target/... into //depot/source/..., then changelist <i>n</i>
  25. will show up in both output1 and output2. 
  26. So this method can be used as a rough 
  27. indicator, but it's not as reliable as:
  28. <pre>
  29. 	p4 integ -n //depot/source/... //depot/target/...
  30. </pre>
  31. which shows you which <i>files</i> in the target branch need revisions
  32. integrated from the source branch.
  33.  
  34. </blockquote>
  35.  
  36. <p>
  37. <i>(January 1998)</i>
  38. <p>
  39. <font size=-2><b><a href="branching.html#br13">[INDEX]</a></b></font>
  40.  
  41. <hr>
  42. <h6>This is file $Id: //guest/laura_wingerd/perforce/faq/br13.html#1 $ in the 
  43. <a href="http://public.perforce.com/public/index.html">Perforce Public Depot</a></h6>
  44. </body>
  45. </html>
# Change User Description Committed
#1 83 Laura Wingerd The Branching Papers. 26 years ago