P4API.MergeDataProperties.html #1 

<html dir="LTR">
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=Windows-1252" />
    <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5" />
    <title>MergeData Properties</title>
    <xml>
    </xml>
    <link rel="stylesheet" type="text/css" href="MSDN.css" />
  </head>
  <body id="bodyID" class="dtBODY">
    <div id="nsbanner">	<div id="bannerrow1">
		<table class="bannerparthead" cellspacing="0" id="Table1">
			<tr id="hdr">
				<td class="runninghead">Perforce API for the .Net CLR</td>
				<td class="product"><img alt="P4.Net" src="p4net.GIF" /></td>
			</tr>
		</table>
	</div>
	<div id="TitleRow">
		<h1 class="dtH1">MergeDataProperties</h1>
</div>
</div>
    <div id="nstext">
      <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>
      <h4 class="dtH4">Public Instance Properties</h4>
      <div class="tablediv">
        <table class="dtTABLE" cellspacing="0">
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
      </div>
      <h4 class="dtH4">See Also</h4>
      <p>
        <a href="P4API.MergeData.html">MergeData Class</a> | <a href="P4API.html">P4API Namespace</a></p>
      <object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e" viewastext="true" style="display: none;">
        <param name="Keyword" value="MergeData class, properties">
        </param>
      </object>
      <hr />
      <div id="footer">
        <p>
          <a href="Copyright.html">Copyright  2006 Shawn Hladky</a>
        </p>
        <p>
        </p>
      </div>
    </div>
  </body>
</html>
# Change User Description Committed
#1 19706 MikeEheler Populate //guest/shawn_hladky/P4.Net/...
//guest/MikeEheler/P4.Net/....
//guest/shawn_hladky/P4.Net/main/doc/html/P4API.MergeDataProperties.html
#1 7709 Shawn Hladky P4.Net:  Cleanup, documentation, and a a start for implementing an object-based output for filelog.