Loading...
Helix SwarmHelix Swarm
Loading...

br08.html

  • //
  • guest/
  • laura_wingerd/
  • perforce/
  • faq/
  • br08.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#br08">[INDEX]</a></b></font>
  7. <p>
  8. <b>
  9. What is this "filelog" output telling me?
  10. </b>
  11. <blockquote>
  12. If you do a 'p4 filelog' 
  13. on a file, you get the complete record of which deltas were merged into
  14. that file, and from which depot path & file they originated.
  15. Here's an example of what 'p4 filelog' reports for a file that has
  16. some renaming & branching history:
  17. <pre>
  18. 	% p4 filelog //depot/main/jam/filescan.c
  19. 	//depot/main/jam/filescan.c
  20. 	... #2 change 5052 integrate on 1998/04/13 by laura@testclient 
  21. 		'Merge r1->main. '
  22. 	... ... merge from //depot/r1/jam/scan.c#1,#3
  23. 	... #1 change 5049 branch on 1998/04/13 by laura@testclient 
  24. 		'Rename scan.c->filescan.c. '
  25. 	... ... branch from //depot/main/jam/scan.c#1,#19
  26. 	... ... merge into //depot/r1/jam/scan.c#3
  27. 	% 
  28. </pre>
  29. In English, here's what this tells us about //depot/main/jam/filescan.c:
  30. <ul>
  31. <p><li>
  32.       the head revision of //depot/main/jam/filescan.c is #2
  33.  
  34. <p><li>
  35.       the action that created #2 was a merge from rev #3
  36.       of //depot/r1/jam/scan.c. So the integration mapping at this
  37.       point in its history is:
  38. <pre>
  39. 	//depot/r1/jam/scan.c //depot/main/jam/filescan.c
  40. </pre>
  41. <p><li>
  42.       the action that created #1 was a branch from //depot/main/jam/scan.c#19.
  43.       I.e., scan.c was renamed filescan.c at this point.
  44. </ul>
  45. <p>
  46. The history of //depot/r1/jam/scan.c is also relevant here. A filelog
  47. on it produces:
  48. <pre>
  49. 	% p4 filelog //depot/r1/jam/scan.c
  50. 	//depot/r1/jam/scan.c
  51. 	... #3 change 5051 integrate on 1998/04/13 by laura@testclient 
  52. 		'Merge main->r1. '
  53. 	... ... merge from //depot/main/jam/filescan.c#1
  54. 	... ... merge into //depot/main/jam/filescan.c#2
  55. 	... #2 change 5050 edit on 1998/04/13 by laura@testclient 
  56. 		'Fix dirname case change. '
  57. 	... #1 change 5047 branch on 1998/04/13 by laura@testclient 
  58. 		'Branch main into r1. '
  59. 	... ... branch from //depot/main/jam/scan.c#1,#18
  60. 	% 
  61. </pre>
  62. So we see it was originally branched from //depot/main/jam/scan.c, but as of
  63. rev #3 it is now related to //depot/main/jam/filescan.c.
  64.  
  65. </blockquote>
  66.  
  67. <p>
  68. <i>(April 1998)</i>
  69. </p>
  70. <font size=-2><b><a href="branching.html#br08">[INDEX]</a></b></font>
  71.  
  72. <hr>
  73. <h6>This is file $Id: //guest/laura_wingerd/perforce/faq/br08.html#1 $ in the 
  74. <a href="http://public.perforce.com/public/index.html">Perforce Public Depot</a></h6>
  75. </body>
  76. </html>
# Change User Description Committed
#1 83 Laura Wingerd The Branching Papers. 26 years ago