<html> <head> <title>The Branching Papers -- Perforce FAQs</title> <head> <body bgcolor=#ffffff> <font size=-2><b><a href="branching.html#br13">[INDEX]</a></b></font> <p> <b> How do I find out which <i>changelists</i> (not <i>files</i>) need integrating from one branch to another? </b> <blockquote> You can compare the outputs of the <b>p4 changes -i</b> command. For example: <pre> p4 changes -i //depot/target/... > output1 p4 changes -i //depot/source/... > output2 diff output1 output2 </pre> Changelists in output2 that aren't also in output1 are candidates for integration. However, be aware that if <i>any</i> file revision associated with changelist <i>n</i> was integrated from //depot/target/... into //depot/source/..., then changelist <i>n</i> will show up in both output1 and output2. So this method can be used as a rough indicator, but it's not as reliable as: <pre> p4 integ -n //depot/source/... //depot/target/... </pre> which shows you which <i>files</i> in the target branch need revisions integrated from the source branch. </blockquote> <p> <i>(January 1998)</i> <p> <font size=-2><b><a href="branching.html#br13">[INDEX]</a></b></font> <hr> <h6>This is file $Id: //public/perforce/faq/br13.html#1 $ in the <a href="http://public.perforce.com/public/index.html">Perforce Public Depot</a></h6> </body> </html>
Move user FAQ to //guest branch and provide pointers.
Remove old branching FAQ.
Update page to reference Perforce Software documentation.
Publish "Branching FAQ"
(pull in changes from //guest/laura_wingerd/perforce/faq/... )
|#1||83||laura_wingerd||The Branching Papers.|