Loading...
Helix SwarmHelix Swarm
Loading...

P4API.MergeDataMembers.html

  • //
  • guest/
  • rjnilsson/
  • P4.Net/
  • MAIN/
  • doc/
  • html/
  • P4API.MergeDataMembers.html #1
  • View
  • Commits
  • Open Download .zip Download (8 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 Members</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">MergeData Members
  21. 					</h1>
  22. </div>
  23. </div>
  24.     <div id="nstext">
  25.       <p>
  26.         <a href="P4API.MergeData.html">MergeData overview</a>
  27.       </p>
  28.       <h4 class="dtH4">Public Instance Properties</h4>
  29.       <div class="tablediv">
  30.         <table class="dtTABLE" cellspacing="0">
  31. <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>
  32. <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>
  33. <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>
  34. <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>
  35. <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>
  36. <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>
  37. <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>
  38. <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>
  39. <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>
  40. <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>
  41. <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>
  42. <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>
  43. <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>
  44. <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>
  45. <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>
  46.       </div>
  47.       <h4 class="dtH4">Public Instance Methods</h4>
  48.       <div class="tablediv">
  49.         <table class="dtTABLE" cellspacing="0">
  50. <tr VALIGN="top"><td width="50%"><img src="pubmethod.gif"></img><a href="P4API.MergeData.Dispose.html">Dispose</a></td><td width="50%"> Frees unmanaged memory. </td></tr>
  51. <tr VALIGN="top"><td width="50%"><img src="pubmethod.gif"></img><a href="ms-help://MS.NETFrameworkSDKv1.1/cpref/html/frlrfSystemObjectClassEqualsTopic.htm">Equals</a> (inherited from <b>Object</b>)</td><td width="50%">Determines whether the specified <a href="ms-help://MS.NETFrameworkSDKv1.1/cpref/html/frlrfSystemObjectClassTopic.htm">Object</a> is equal to the current <a href="ms-help://MS.NETFrameworkSDKv1.1/cpref/html/frlrfSystemObjectClassTopic.htm">Object</a>.</td></tr>
  52. <tr VALIGN="top"><td width="50%"><img src="pubmethod.gif"></img><a href="ms-help://MS.NETFrameworkSDKv1.1/cpref/html/frlrfSystemObjectClassGetHashCodeTopic.htm">GetHashCode</a> (inherited from <b>Object</b>)</td><td width="50%">Serves as a hash function for a particular type. </td></tr>
  53. <tr VALIGN="top"><td width="50%"><img src="pubmethod.gif"></img><a href="ms-help://MS.NETFrameworkSDKv1.1/cpref/html/frlrfSystemObjectClassGetTypeTopic.htm">GetType</a> (inherited from <b>Object</b>)</td><td width="50%">Gets the <a href="ms-help://MS.NETFrameworkSDKv1.1/cpref/html/frlrfSystemTypeClassTopic.htm">Type</a> of the current instance.</td></tr>
  54. <tr VALIGN="top"><td width="50%"><img src="pubmethod.gif"></img><a href="P4API.MergeData.RunMergeTool.html">RunMergeTool</a></td><td width="50%"> Runs the external merge tool configured by P4MERGE. </td></tr>
  55. <tr VALIGN="top"><td width="50%"><img src="pubmethod.gif"></img><a href="ms-help://MS.NETFrameworkSDKv1.1/cpref/html/frlrfSystemObjectClassToStringTopic.htm">ToString</a> (inherited from <b>Object</b>)</td><td width="50%">Returns a <a href="ms-help://MS.NETFrameworkSDKv1.1/cpref/html/frlrfSystemStringClassTopic.htm">String</a> that represents the current <a href="ms-help://MS.NETFrameworkSDKv1.1/cpref/html/frlrfSystemObjectClassTopic.htm">Object</a>.</td></tr></table>
  56.       </div>
  57.       <h4 class="dtH4">Protected Instance Methods</h4>
  58.       <div class="tablediv">
  59.         <table class="dtTABLE" cellspacing="0">
  60. <tr VALIGN="top"><td width="50%"><img src="protmethod.gif"></img><a href="ms-help://MS.NETFrameworkSDKv1.1/cpref/html/frlrfSystemObjectClassFinalizeTopic.htm">Finalize</a> (inherited from <b>Object</b>)</td><td width="50%">Allows an <a href="ms-help://MS.NETFrameworkSDKv1.1/cpref/html/frlrfSystemObjectClassTopic.htm">Object</a> to attempt to free resources and perform other cleanup operations before the <a href="ms-help://MS.NETFrameworkSDKv1.1/cpref/html/frlrfSystemObjectClassTopic.htm">Object</a> is reclaimed by garbage collection.</td></tr>
  61. <tr VALIGN="top"><td width="50%"><img src="protmethod.gif"></img><a href="ms-help://MS.NETFrameworkSDKv1.1/cpref/html/frlrfSystemObjectClassMemberwiseCloneTopic.htm">MemberwiseClone</a> (inherited from <b>Object</b>)</td><td width="50%">Creates a shallow copy of the current <a href="ms-help://MS.NETFrameworkSDKv1.1/cpref/html/frlrfSystemObjectClassTopic.htm">Object</a>.</td></tr></table>
  62.       </div>
  63.       <h4 class="dtH4">See Also</h4>
  64.       <p>
  65.         <a href="P4API.MergeData.html">MergeData Class</a> | <a href="P4API.html">P4API Namespace</a></p>
  66.       <object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e" viewastext="true" style="display: none;">
  67.         <param name="Keyword" value="MergeData class">
  68.         </param>
  69.         <param name="Keyword" value="P4API.MergeData class">
  70.         </param>
  71.         <param name="Keyword" value="MergeData class, all members">
  72.         </param>
  73.       </object>
  74.       <hr />
  75.       <div id="footer">
  76.         <p>
  77.           <a href="Copyright.html">Copyright  2006 Shawn Hladky</a>
  78.         </p>
  79.         <p>
  80.         </p>
  81.       </div>
  82.     </div>
  83.   </body>
  84. </html>
# Change User Description Committed
#1 7889 Johan Nilsson Branch from Shawn Hladky's original P4.Net (main branch).
Changed file type for StandardT...est.cs and UnicodeTest.cs in order to be able to check them in. «		 14 years ago
//guest/shawn_hladky/P4.Net/main/doc/html/P4API.MergeDataMembers.html
#1 7709 Shawn Hladky P4.Net:  Cleanup, documentation, and a a start for implementing an object-based outpu...t for filelog. « 15 years ago