Loading...
Helix SwarmHelix Swarm
Loading...

P4API.MergeDataProperties.html

  • //
  • guest/
  • shawn_hladky/
  • P4.Net/
  • main/
  • doc/
  • html/
  • P4API.MergeDataProperties.html #1
  • View
  • Commits
  • Open Download .zip Download (5 KB) 
  1. <html dir="LTR">
  2.   <head>
  3.     <meta http-equiv="Content-Type" content="text/html; charset=Windows-1252" />
  4.     <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5" />
  5.     <title>MergeData Properties</title>
  6.     <xml>
  7.     </xml>
  8.     <link rel="stylesheet" type="text/css" href="MSDN.css" />
  9.   </head>
  10.   <body id="bodyID" class="dtBODY">
  11.     <div id="nsbanner">	<div id="bannerrow1">
  12. 		<table class="bannerparthead" cellspacing="0" id="Table1">
  13. 			<tr id="hdr">
  14. 				<td class="runninghead">Perforce API for the .Net CLR</td>
  15. 				<td class="product"><img alt="P4.Net" src="p4net.GIF" /></td>
  16. 			</tr>
  17. 		</table>
  18. 	</div>
  19. 	<div id="TitleRow">
  20. 		<h1 class="dtH1">MergeDataProperties</h1>
  21. </div>
  22. </div>
  23.     <div id="nstext">
  24.       <p>The properties of the <b>MergeData</b> class are listed below. For a complete list of <b>MergeData</b> class members, see the <a href="P4API.MergeDataMembers.html">MergeData Members</a> topic.</p>
  25.       <h4 class="dtH4">Public Instance Properties</h4>
  26.       <div class="tablediv">
  27.         <table class="dtTABLE" cellspacing="0">
  28. <tr VALIGN="top"><td width="50%"><img src="pubproperty.gif"></img><a href="P4API.MergeData.BaseFile.html">BaseFile</a></td><td width="50%"> Base file for the 3-way merge. </td></tr>
  29. <tr VALIGN="top"><td width="50%"><img src="pubproperty.gif"></img><a href="P4API.MergeData.BaseName.html">BaseName</a></td><td width="50%"> Perforce name of the base file. Format is '//depot/path/file.ext#rev'. </td></tr>
  30. <tr VALIGN="top"><td width="50%"><img src="pubproperty.gif"></img><a href="P4API.MergeData.BothChunks.html">BothChunks</a></td><td width="50%"> Returns the number of chunks that have the same change in both files. </td></tr>
  31. <tr VALIGN="top"><td width="50%"><img src="pubproperty.gif"></img><a href="P4API.MergeData.ConflictChunks.html">ConflictChunks</a></td><td width="50%"> Returns the number of chunks that have conflicts. </td></tr>
  32. <tr VALIGN="top"><td width="50%"><img src="pubproperty.gif"></img><a href="P4API.MergeData.MergeDigest.html">MergeDigest</a></td><td width="50%"> Returns the MD5 checksum of WHAT?? file. </td></tr>
  33. <tr VALIGN="top"><td width="50%"><img src="pubproperty.gif"></img><a href="P4API.MergeData.MergeHint.html">MergeHint</a></td><td width="50%"> Perforce's recommended merge action. </td></tr>
  34. <tr VALIGN="top"><td width="50%"><img src="pubproperty.gif"></img><a href="P4API.MergeData.ResultFile.html">ResultFile</a></td><td width="50%"> File where merged result should be written. </td></tr>
  35. <tr VALIGN="top"><td width="50%"><img src="pubproperty.gif"></img><a href="P4API.MergeData.TheirChunks.html">TheirChunks</a></td><td width="50%"> Returns the number of chunks with changes in their file. </td></tr>
  36. <tr VALIGN="top"><td width="50%"><img src="pubproperty.gif"></img><a href="P4API.MergeData.TheirDigest.html">TheirDigest</a></td><td width="50%"> Returns the MD5 checksum of their file. </td></tr>
  37. <tr VALIGN="top"><td width="50%"><img src="pubproperty.gif"></img><a href="P4API.MergeData.TheirFile.html">TheirFile</a></td><td width="50%"> Thier file for the 3-way merge. </td></tr>
  38. <tr VALIGN="top"><td width="50%"><img src="pubproperty.gif"></img><a href="P4API.MergeData.TheirName.html">TheirName</a></td><td width="50%"> Perforce name of their file. Format is '//depot/path/file.ext#rev'. </td></tr>
  39. <tr VALIGN="top"><td width="50%"><img src="pubproperty.gif"></img><a href="P4API.MergeData.YourChunks.html">YourChunks</a></td><td width="50%"> Returns the number of chunks changed in your file. </td></tr>
  40. <tr VALIGN="top"><td width="50%"><img src="pubproperty.gif"></img><a href="P4API.MergeData.YourDigest.html">YourDigest</a></td><td width="50%"> Returns the MD5 checksum of your file. </td></tr>
  41. <tr VALIGN="top"><td width="50%"><img src="pubproperty.gif"></img><a href="P4API.MergeData.YourFile.html">YourFile</a></td><td width="50%"> Your file for the 3-way merge. </td></tr>
  42. <tr VALIGN="top"><td width="50%"><img src="pubproperty.gif"></img><a href="P4API.MergeData.YourName.html">YourName</a></td><td width="50%"> Perforce name of your file. Format is '//client/path/file.ext'. </td></tr></table>
  43.       </div>
  44.       <h4 class="dtH4">See Also</h4>
  45.       <p>
  46.         <a href="P4API.MergeData.html">MergeData Class</a> | <a href="P4API.html">P4API Namespace</a></p>
  47.       <object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e" viewastext="true" style="display: none;">
  48.         <param name="Keyword" value="MergeData class, properties">
  49.         </param>
  50.       </object>
  51.       <hr />
  52.       <div id="footer">
  53.         <p>
  54.           <a href="Copyright.html">Copyright  2006 Shawn Hladky</a>
  55.         </p>
  56.         <p>
  57.         </p>
  58.       </div>
  59.     </div>
  60.   </body>
  61. </html>
# Change User Description Committed
#1 7709 Shawn Hladky P4.Net:  Cleanup, documentation, and a a start for implementing an object-based outpu...t for filelog. « 15 years ago