Loading...
Helix SwarmHelix Swarm
Loading...

P4API.MergeAction.html

  • //
  • guest/
  • MikeEheler/
  • P4.Net/
  • main/
  • doc/
  • html/
  • P4API.MergeAction.html #1
  • View
  • Commits
  • Open Download .zip Download (4 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>MergeAction Enumeration</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">MergeAction Enumeration</h1>
  21. </div>
  22. </div>
  23.     <div id="nstext">
  24.       <p> Actions to take when resolving a file. </p>
  25.       <div class="syntax">
  26.         <span class="lang">[VisualBasic]</span>
  27.         <br />PublicEnumMergeAction</div>
  28.       <div class="syntax">
  29.         <span class="lang">[C#]</span>
  30.         <div>publicenumMergeAction</div>
  31.       </div>
  32.       <h4 class="dtH4">Remarks</h4>
  33.       <p>
  34.             </p>
  35.       <h4 class="dtH4">Members</h4>
  36.       <div class="tablediv">
  37.         <table class="dtTABLE" cellspacing="0">
  38.           <tr valign="top">
  39.             <th width="50%">Member Name</th>
  40.             <th width="50%">Description</th>
  41.           </tr>
  42. <tr valign="top"><td><b>Quit</b></td><td> Quit the resolve workflow. </td></tr>
  43. <tr valign="top"><td><b>Skip</b></td><td> Skip this file in the resolve workflow. </td></tr>
  44. <tr valign="top"><td><b>AcceptMerged</b></td><td> Accept the merged file from Perforce. This file must not be edited. </td></tr>
  45. <tr valign="top"><td><b>AcceptEdit</b></td><td> Accept the result file with your edits. The result file should be edited before returning this merge action. </td></tr>
  46. <tr valign="top"><td><b>AcceptTheirs</b></td><td> Accept 'their' file ('your' changes will be lost). </td></tr>
  47. <tr valign="top"><td><b>AcceptYours</b></td><td> Accept 'your' file ('thier' changes will be lost). </td></tr></table>
  48.       </div>
  49.       <h4 class="dtH4">Requirements</h4>
  50.       <p>
  51.         <b>Namespace: </b>
  52.         <a href="P4API.html">P4API</a>
  53.       </p>
  54.       <p>
  55.         <b>Assembly: </b>p4api (in p4api.dll)
  56. 					</p>
  57.       <h4 class="dtH4">See Also</h4>
  58.       <p>
  59.         <a href="P4API.html">P4API Namespace</a>
  60.       </p>
  61.       <object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e" viewastext="true" style="display: none;">
  62.         <param name="Keyword" value="MergeAction enumeration">
  63.         </param>
  64.         <param name="Keyword" value="P4API.MergeAction enumeration">
  65.         </param>
  66.         <param name="Keyword" value="Quit enumeration member">
  67.         </param>
  68.         <param name="Keyword" value="MergeAction.Quit enumeration member">
  69.         </param>
  70.         <param name="Keyword" value="Skip enumeration member">
  71.         </param>
  72.         <param name="Keyword" value="MergeAction.Skip enumeration member">
  73.         </param>
  74.         <param name="Keyword" value="AcceptMerged enumeration member">
  75.         </param>
  76.         <param name="Keyword" value="MergeAction.AcceptMerged enumeration member">
  77.         </param>
  78.         <param name="Keyword" value="AcceptEdit enumeration member">
  79.         </param>
  80.         <param name="Keyword" value="MergeAction.AcceptEdit enumeration member">
  81.         </param>
  82.         <param name="Keyword" value="AcceptTheirs enumeration member">
  83.         </param>
  84.         <param name="Keyword" value="MergeAction.AcceptTheirs enumeration member">
  85.         </param>
  86.         <param name="Keyword" value="AcceptYours enumeration member">
  87.         </param>
  88.         <param name="Keyword" value="MergeAction.AcceptYours enumeration member">
  89.         </param>
  90.       </object>
  91.       <hr />
  92.       <div id="footer">
  93.         <p>
  94.           <a href="Copyright.html">Copyright  2006 Shawn Hladky</a>
  95.         </p>
  96.         <p>
  97.         </p>
  98.       </div>
  99.     </div>
  100.   </body>
  101. </html>
# Change User Description Committed
#1 19706 MikeEheler Populate //guest/shawn_hladky/P4.Net/...
//guest/MikeEheler/P4.Net/.... 		9 years ago
//guest/shawn_hladky/P4.Net/main/doc/html/P4API.MergeAction.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