<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <!--NewPage--> <HTML> <HEAD> <!-- Generated by javadoc (build 1.6.0_06) on Tue Nov 30 14:45:46 PST 2010 --> <TITLE> ResolveTask (P4Ant) </TITLE> <META NAME="date" CONTENT="2010-11-30"> <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style"> <SCRIPT type="text/javascript"> function windowTitle() { if (location.href.indexOf('is-external=true') == -1) { parent.document.title="ResolveTask (P4Ant)"; } } </SCRIPT> <NOSCRIPT> </NOSCRIPT> </HEAD> <BODY BGCOLOR="white" onload="windowTitle();"> <HR> <!-- ========= START OF TOP NAVBAR ======= --> <A NAME="navbar_top"><!-- --></A> <A HREF="#skip-navbar_top" title="Skip navigation links"></A> <TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY=""> <TR> <TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A NAME="navbar_top_firstrow"><!-- --></A> <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY=""> <TR ALIGN="center" VALIGN="top"> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD> <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ResolveTask.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD> </TR> </TABLE> </TD> <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM> </EM> </TD> </TR> <TR> <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2"> <A HREF="../../../../../com/perforce/p4java/ant/tasks/ReopenTask.html" title="class in com.perforce.p4java.ant.tasks"><B>PREV CLASS</B></A> <A HREF="../../../../../com/perforce/p4java/ant/tasks/RevertTask.html" title="class in com.perforce.p4java.ant.tasks"><B>NEXT CLASS</B></A></FONT></TD> <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2"> <A HREF="../../../../../index.html?com/perforce/p4java/ant/tasks/ResolveTask.html" target="_top"><B>FRAMES</B></A> <A HREF="ResolveTask.html" target="_top"><B>NO FRAMES</B></A> <SCRIPT type="text/javascript"> <!-- if(window==top) { document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>'); } //--> </SCRIPT> <NOSCRIPT> <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A> </NOSCRIPT> </FONT></TD> </TR> <TR> <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2"> SUMMARY: <A HREF="#nested_classes_inherited_from_class_com.perforce.p4java.ant.tasks.ServerTask">NESTED</A> | <A HREF="#field_summary">FIELD</A> | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD> <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2"> DETAIL: <A HREF="#field_detail">FIELD</A> | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD> </TR> </TABLE> <A NAME="skip-navbar_top"></A> <!-- ========= END OF TOP NAVBAR ========= --> <HR> <!-- ======== START OF CLASS DATA ======== --> <H2> <FONT SIZE="-1"> com.perforce.p4java.ant.tasks</FONT> <BR> Class ResolveTask</H2> <PRE> java.lang.Object <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by ">org.apache.tools.ant.ProjectComponent <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by ">org.apache.tools.ant.Task <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html" title="class in com.perforce.p4java.ant.tasks">com.perforce.p4java.ant.tasks.PerforceTask</A> <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html" title="class in com.perforce.p4java.ant.tasks">com.perforce.p4java.ant.tasks.ServerTask</A> <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html" title="class in com.perforce.p4java.ant.tasks">com.perforce.p4java.ant.tasks.ClientTask</A> <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><B>com.perforce.p4java.ant.tasks.ResolveTask</B> </PRE> <DL> <DT><B>All Implemented Interfaces:</B> <DD>java.lang.Cloneable</DD> </DL> <HR> <DL> <DT><PRE>public class <B>ResolveTask</B><DT>extends <A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html" title="class in com.perforce.p4java.ant.tasks">ClientTask</A></DL> </PRE> <P> Merge open files with other revisions or files. Automatically resolve the results of a previous Perforce file integration. Note also that having safeMerge, acceptTheirs, acceptYours, and forceResolve all set to false in the associated ResolveFilesAutoOptions object results in "-am" behavior. </p> <P> <P> <DL> <DT><B>See Also:</B><DD><A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html" title="class in com.perforce.p4java.ant.tasks"><CODE>PerforceTask</CODE></A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html" title="class in com.perforce.p4java.ant.tasks"><CODE>ClientTask</CODE></A></DL> <HR> <P> <!-- ======== NESTED CLASS SUMMARY ======== --> <A NAME="nested_class_summary"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> <TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2"> <B>Nested Class Summary</B></FONT></TH> </TR> </TABLE> <A NAME="nested_classes_inherited_from_class_com.perforce.p4java.ant.tasks.ServerTask"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Nested classes/interfaces inherited from class com.perforce.p4java.ant.tasks.<A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html" title="class in com.perforce.p4java.ant.tasks">ServerTask</A></B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.GlobalOption.html" title="class in com.perforce.p4java.ant.tasks">ServerTask.GlobalOption</A></CODE></TD> </TR> </TABLE> <A NAME="nested_classes_inherited_from_class_com.perforce.p4java.ant.tasks.PerforceTask"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Nested classes/interfaces inherited from class com.perforce.p4java.ant.tasks.<A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html" title="class in com.perforce.p4java.ant.tasks">PerforceTask</A></B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.Field.html" title="class in com.perforce.p4java.ant.tasks">PerforceTask.Field</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.File.html" title="class in com.perforce.p4java.ant.tasks">PerforceTask.File</A></CODE></TD> </TR> </TABLE> <!-- =========== FIELD SUMMARY =========== --> <A NAME="field_summary"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> <TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2"> <B>Field Summary</B></FONT></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected boolean</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/ResolveTask.html#acceptTheirs">acceptTheirs</A></B></CODE> <BR> If true, automatically accept "their" changes, as documented for the p4 "-at" option.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected boolean</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/ResolveTask.html#acceptYours">acceptYours</A></B></CODE> <BR> If true, automatically accept "your" changes, as documented for the p4 "-ay" option.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected boolean</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/ResolveTask.html#forceResolve">forceResolve</A></B></CODE> <BR> Forces auto-mode resolve to accept the merged file even if there are conflicts.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected boolean</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/ResolveTask.html#safeMerge">safeMerge</A></B></CODE> <BR> If true, only do "safe" resolves, as documented for the p4 "-as" option.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected boolean</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/ResolveTask.html#showActionsOnly">showActionsOnly</A></B></CODE> <BR> If true, don't do the actual resolve, just return the actions that would have been performed for the resolve.</TD> </TR> </TABLE> <A NAME="fields_inherited_from_class_com.perforce.p4java.ant.tasks.ClientTask"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Fields inherited from class com.perforce.p4java.ant.tasks.<A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html" title="class in com.perforce.p4java.ant.tasks">ClientTask</A></B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html#p4Client">p4Client</A></CODE></TD> </TR> </TABLE> <A NAME="fields_inherited_from_class_com.perforce.p4java.ant.tasks.ServerTask"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Fields inherited from class com.perforce.p4java.ant.tasks.<A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html" title="class in com.perforce.p4java.ant.tasks">ServerTask</A></B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#allHosts">allHosts</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#commandOptions">commandOptions</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#globaloptions">globaloptions</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#hostName">hostName</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#P4_SERVER_PROTOCOL_PROPERTIES_FILE">P4_SERVER_PROTOCOL_PROPERTIES_FILE</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#P4_SERVER_USAGE_PROPERTIES_FILE">P4_SERVER_USAGE_PROPERTIES_FILE</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#p4Server">p4Server</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#programName">programName</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#programVersion">programVersion</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#protocolPropertiesFile">protocolPropertiesFile</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#protocolProps">protocolProps</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#textLanguage">textLanguage</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#unsetClientName">unsetClientName</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#unsetUserName">unsetUserName</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#usagePropertiesFile">usagePropertiesFile</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#usageProps">usageProps</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#workingDirectory">workingDirectory</A></CODE></TD> </TR> </TABLE> <A NAME="fields_inherited_from_class_com.perforce.p4java.ant.tasks.PerforceTask"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Fields inherited from class com.perforce.p4java.ant.tasks.<A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html" title="class in com.perforce.p4java.ant.tasks">PerforceTask</A></B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#charset">charset</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#client">client</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#failOnError">failOnError</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#fields">fields</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#FILE_TOKEN_REGEX_PATTERN">FILE_TOKEN_REGEX_PATTERN</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#fileList">fileList</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#files">files</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#fileSpecs">fileSpecs</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#LINE_PADDING">LINE_PADDING</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#LINE_SEPARATOR">LINE_SEPARATOR</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#p4Messages">p4Messages</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#passwd">passwd</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#port">port</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#protocol">protocol</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#retFileSpecs">retFileSpecs</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#retStatusMessage">retStatusMessage</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#user">user</A></CODE></TD> </TR> </TABLE> <A NAME="fields_inherited_from_class_org.apache.tools.ant.Task"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Fields inherited from class org.apache.tools.ant.Task</B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE>target, taskName, taskType, wrapper</CODE></TD> </TR> </TABLE> <A NAME="fields_inherited_from_class_org.apache.tools.ant.ProjectComponent"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Fields inherited from class org.apache.tools.ant.ProjectComponent</B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE>description, location, project</CODE></TD> </TR> </TABLE> <!-- ======== CONSTRUCTOR SUMMARY ======== --> <A NAME="constructor_summary"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> <TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2"> <B>Constructor Summary</B></FONT></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/ResolveTask.html#ResolveTask()">ResolveTask</A></B>()</CODE> <BR> Default constructor.</TD> </TR> </TABLE> <!-- ========== METHOD SUMMARY =========== --> <A NAME="method_summary"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> <TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2"> <B>Method Summary</B></FONT></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/ResolveTask.html#execP4Command()">execP4Command</A></B>()</CODE> <BR> Execute the Perforce resolve command with file specs and options.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/ResolveTask.html#setAcceptTheirs(boolean)">setAcceptTheirs</A></B>(boolean acceptTheirs)</CODE> <BR> Sets the accept theirs.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/ResolveTask.html#setAcceptYours(boolean)">setAcceptYours</A></B>(boolean acceptYours)</CODE> <BR> Sets the accept yours.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/ResolveTask.html#setForceResolve(boolean)">setForceResolve</A></B>(boolean forceResolve)</CODE> <BR> Sets the force resolve.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/ResolveTask.html#setSafeMerge(boolean)">setSafeMerge</A></B>(boolean safeMerge)</CODE> <BR> Sets the safe merge.</TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../com/perforce/p4java/ant/tasks/ResolveTask.html#setShowActionsOnly(boolean)">setShowActionsOnly</A></B>(boolean showActionsOnly)</CODE> <BR> Sets the show actions only.</TD> </TR> </TABLE> <A NAME="methods_inherited_from_class_com.perforce.p4java.ant.tasks.ClientTask"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Methods inherited from class com.perforce.p4java.ant.tasks.<A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html" title="class in com.perforce.p4java.ant.tasks">ClientTask</A></B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html#cleanupP4()">cleanupP4</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html#getP4Client()">getP4Client</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html#initP4()">initP4</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ClientTask.html#setP4Client(IClient)">setP4Client</A></CODE></TD> </TR> </TABLE> <A NAME="methods_inherited_from_class_com.perforce.p4java.ant.tasks.ServerTask"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Methods inherited from class com.perforce.p4java.ant.tasks.<A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html" title="class in com.perforce.p4java.ant.tasks">ServerTask</A></B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#cleanupP4Server()">cleanupP4Server</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#createGlobalOption()">createGlobalOption</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#getGlobalOptions()">getGlobalOptions</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#getP4Server()">getP4Server</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#initP4Server()">initP4Server</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#initP4ServerOptions()">initP4ServerOptions</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setAllHosts(boolean)">setAllHosts</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setHostName(java.lang.String)">setHostName</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setP4Server(IOptionsServer)">setP4Server</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setProgramName(java.lang.String)">setProgramName</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setProgramVersion(java.lang.String)">setProgramVersion</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setProtocolPropertiesFile(java.lang.String)">setProtocolPropertiesFile</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setProtocolProps(java.util.Properties)">setProtocolProps</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setTextLanguage(java.lang.String)">setTextLanguage</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setUnsetClientName(java.lang.String)">setUnsetClientName</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setUnsetUserName(java.lang.String)">setUnsetUserName</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setUsagePropertiesFile(java.lang.String)">setUsagePropertiesFile</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setUsageProps(java.util.Properties)">setUsageProps</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/ServerTask.html#setWorkingDirectory(java.lang.String)">setWorkingDirectory</A></CODE></TD> </TR> </TABLE> <A NAME="methods_inherited_from_class_com.perforce.p4java.ant.tasks.PerforceTask"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Methods inherited from class com.perforce.p4java.ant.tasks.<A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html" title="class in com.perforce.p4java.ant.tasks">PerforceTask</A></B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#addFileset(org.apache.tools.ant.types.FileSet)">addFileset</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#createField()">createField</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#createFile()">createFile</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#execute()">execute</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#getFields()">getFields</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#getFiles()">getFiles</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#getFileSpecs()">getFileSpecs</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#getRetFileSpecs()">getRetFileSpecs</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#getRetStatusMessage()">getRetStatusMessage</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#init()">init</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#isEmpty(java.lang.String)">isEmpty</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logChangelistSummaries(java.util.List)">logChangelistSummaries</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logChangelistSummary(IChangelistSummary)">logChangelistSummary</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logExtendedFileSpec(IExtendedFileSpec)">logExtendedFileSpec</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logExtendedFileSpecs(java.util.List)">logExtendedFileSpecs</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logFileDiff(IFileDiff)">logFileDiff</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logFileDiffs(java.util.List)">logFileDiffs</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logFileLineMatch(IFileLineMatch)">logFileLineMatch</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logFileLineMatches(java.util.List)">logFileLineMatches</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logFileSpec(IFileSpec)">logFileSpec</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logFileSpecs(java.util.List)">logFileSpecs</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logFix(IFix)">logFix</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logFixes(java.util.List)">logFixes</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logJob(IJob)">logJob</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#logJobs(java.util.List)">logJobs</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#parseChangelist(java.lang.String)">parseChangelist</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#setCharset(java.lang.String)">setCharset</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#setClient(java.lang.String)">setClient</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#setFailOnError(boolean)">setFailOnError</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#setFiles(java.lang.String)">setFiles</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#setPasswd(java.lang.String)">setPasswd</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#setPort(java.lang.String)">setPort</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#setProtocol(java.lang.String)">setProtocol</A>, <A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#setUser(java.lang.String)">setUser</A></CODE></TD> </TR> </TABLE> <A NAME="methods_inherited_from_class_org.apache.tools.ant.Task"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Methods inherited from class org.apache.tools.ant.Task</B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE>bindToOwner, getOwningTarget, getRuntimeConfigurableWrapper, getTaskName, getTaskType, getWrapper, handleErrorFlush, handleErrorOutput, handleFlush, handleInput, handleOutput, isInvalid, log, log, log, log, maybeConfigure, perform, reconfigure, setOwningTarget, setRuntimeConfigurableWrapper, setTaskName, setTaskType</CODE></TD> </TR> </TABLE> <A NAME="methods_inherited_from_class_org.apache.tools.ant.ProjectComponent"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Methods inherited from class org.apache.tools.ant.ProjectComponent</B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE>clone, getDescription, getLocation, getProject, setDescription, setLocation, setProject</CODE></TD> </TR> </TABLE> <A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor"> <TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE>equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD> </TR> </TABLE> <P> <!-- ============ FIELD DETAIL =========== --> <A NAME="field_detail"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> <TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2"> <B>Field Detail</B></FONT></TH> </TR> </TABLE> <A NAME="safeMerge"><!-- --></A><H3> safeMerge</H3> <PRE> protected boolean <B>safeMerge</B></PRE> <DL> <DD>If true, only do "safe" resolves, as documented for the p4 "-as" option. <P> <DL> </DL> </DL> <HR> <A NAME="acceptTheirs"><!-- --></A><H3> acceptTheirs</H3> <PRE> protected boolean <B>acceptTheirs</B></PRE> <DL> <DD>If true, automatically accept "their" changes, as documented for the p4 "-at" option. <P> <DL> </DL> </DL> <HR> <A NAME="acceptYours"><!-- --></A><H3> acceptYours</H3> <PRE> protected boolean <B>acceptYours</B></PRE> <DL> <DD>If true, automatically accept "your" changes, as documented for the p4 "-ay" option. <P> <DL> </DL> </DL> <HR> <A NAME="showActionsOnly"><!-- --></A><H3> showActionsOnly</H3> <PRE> protected boolean <B>showActionsOnly</B></PRE> <DL> <DD>If true, don't do the actual resolve, just return the actions that would have been performed for the resolve. <P> <DL> </DL> </DL> <HR> <A NAME="forceResolve"><!-- --></A><H3> forceResolve</H3> <PRE> protected boolean <B>forceResolve</B></PRE> <DL> <DD>Forces auto-mode resolve to accept the merged file even if there are conflicts. Corresponds to the -af option. <P> <DL> </DL> </DL> <!-- ========= CONSTRUCTOR DETAIL ======== --> <A NAME="constructor_detail"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> <TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2"> <B>Constructor Detail</B></FONT></TH> </TR> </TABLE> <A NAME="ResolveTask()"><!-- --></A><H3> ResolveTask</H3> <PRE> public <B>ResolveTask</B>()</PRE> <DL> <DD>Default constructor. <P> </DL> <!-- ============ METHOD DETAIL ========== --> <A NAME="method_detail"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> <TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2"> <B>Method Detail</B></FONT></TH> </TR> </TABLE> <A NAME="setSafeMerge(boolean)"><!-- --></A><H3> setSafeMerge</H3> <PRE> public void <B>setSafeMerge</B>(boolean safeMerge)</PRE> <DL> <DD>Sets the safe merge. <P> <DD><DL> <DT><B>Parameters:</B><DD><CODE>safeMerge</CODE> - the new safe merge</DL> </DD> </DL> <HR> <A NAME="setAcceptTheirs(boolean)"><!-- --></A><H3> setAcceptTheirs</H3> <PRE> public void <B>setAcceptTheirs</B>(boolean acceptTheirs)</PRE> <DL> <DD>Sets the accept theirs. <P> <DD><DL> <DT><B>Parameters:</B><DD><CODE>acceptTheirs</CODE> - the new accept theirs</DL> </DD> </DL> <HR> <A NAME="setAcceptYours(boolean)"><!-- --></A><H3> setAcceptYours</H3> <PRE> public void <B>setAcceptYours</B>(boolean acceptYours)</PRE> <DL> <DD>Sets the accept yours. <P> <DD><DL> <DT><B>Parameters:</B><DD><CODE>acceptYours</CODE> - the new accept yours</DL> </DD> </DL> <HR> <A NAME="setShowActionsOnly(boolean)"><!-- --></A><H3> setShowActionsOnly</H3> <PRE> public void <B>setShowActionsOnly</B>(boolean showActionsOnly)</PRE> <DL> <DD>Sets the show actions only. <P> <DD><DL> <DT><B>Parameters:</B><DD><CODE>showActionsOnly</CODE> - the new show actions only</DL> </DD> </DL> <HR> <A NAME="setForceResolve(boolean)"><!-- --></A><H3> setForceResolve</H3> <PRE> public void <B>setForceResolve</B>(boolean forceResolve)</PRE> <DL> <DD>Sets the force resolve. <P> <DD><DL> <DT><B>Parameters:</B><DD><CODE>forceResolve</CODE> - the new force resolve</DL> </DD> </DL> <HR> <A NAME="execP4Command()"><!-- --></A><H3> execP4Command</H3> <PRE> protected void <B>execP4Command</B>() throws org.apache.tools.ant.BuildException</PRE> <DL> <DD>Execute the Perforce resolve command with file specs and options. Log the returned file specs. <p> Automatically resolve the results of a previousPerforce file integration. <p> Note that this is currently a very limited version of the full Perforce resolve feature, corresponding only to (some of) the various auto-resolve features, meaning this method will never invoke (or need to invoke) end user interaction. More extensive versions of the resolve command will be surfaced as needed. <p> This method notionally returns an IFileSpec, as it's closely related to the integ method and shares many of its return values, but there are several limitations in the use of the returned IFileSpecs. In general, what is returned from this method is a mixture of resolution info messages (i.e. messages from the server that spell out what would or did happen during the resolve), and "true" filespecs. In the latter case, the filespec has a very limited set of valid fields: only client path, from file, and the from revisions are guaranteed to be valid. In the former case, since the info messages do NOT correspond one-to-one with the input file specs that caused the messages, consumers need to explicitly search each returned info message string for the relevant file path or name. This is an unfortunate artefact of the Perforce server's implementation of this command. <p> Note: results and behaviour are undefined if clashing or inconsistent options are used with this method. In general, the behaviour of (e.g.) setting both acceptYours and acceptTheirs true will be whatever the Perforce server makes of it (usually an error), but that's not guaranteed.... <p> Note also that having safeMerge, acceptTheirs, acceptYours, and forceResolve all set to false in the associated ResolveFilesAutoOptions object results in "-am" behavior. <P> <DD><DL> <DT><B>Specified by:</B><DD><CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#execP4Command()">execP4Command</A></CODE> in class <CODE><A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html" title="class in com.perforce.p4java.ant.tasks">PerforceTask</A></CODE></DL> </DD> <DD><DL> <DT><B>Throws:</B> <DD><CODE>org.apache.tools.ant.BuildException</CODE> - the build exception<DT><B>See Also:</B><DD><A HREF="../../../../../com/perforce/p4java/ant/tasks/PerforceTask.html#execP4Command()"><CODE>PerforceTask.execP4Command()</CODE></A></DL> </DD> </DL> <!-- ========= END OF CLASS DATA ========= --> <HR> <!-- ======= START OF BOTTOM NAVBAR ====== --> <A NAME="navbar_bottom"><!-- --></A> <A HREF="#skip-navbar_bottom" title="Skip navigation links"></A> <TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY=""> <TR> <TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A NAME="navbar_bottom_firstrow"><!-- --></A> <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY=""> <TR ALIGN="center" VALIGN="top"> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A> </TD> <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> <FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/ResolveTask.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A> </TD> <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A> </TD> </TR> </TABLE> </TD> <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM> </EM> </TD> </TR> <TR> <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2"> <A HREF="../../../../../com/perforce/p4java/ant/tasks/ReopenTask.html" title="class in com.perforce.p4java.ant.tasks"><B>PREV CLASS</B></A> <A HREF="../../../../../com/perforce/p4java/ant/tasks/RevertTask.html" title="class in com.perforce.p4java.ant.tasks"><B>NEXT CLASS</B></A></FONT></TD> <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2"> <A HREF="../../../../../index.html?com/perforce/p4java/ant/tasks/ResolveTask.html" target="_top"><B>FRAMES</B></A> <A HREF="ResolveTask.html" target="_top"><B>NO FRAMES</B></A> <SCRIPT type="text/javascript"> <!-- if(window==top) { document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>'); } //--> </SCRIPT> <NOSCRIPT> <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A> </NOSCRIPT> </FONT></TD> </TR> <TR> <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2"> SUMMARY: <A HREF="#nested_classes_inherited_from_class_com.perforce.p4java.ant.tasks.ServerTask">NESTED</A> | <A HREF="#field_summary">FIELD</A> | <A HREF="#constructor_summary">CONSTR</A> | <A HREF="#method_summary">METHOD</A></FONT></TD> <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2"> DETAIL: <A HREF="#field_detail">FIELD</A> | <A HREF="#constructor_detail">CONSTR</A> | <A HREF="#method_detail">METHOD</A></FONT></TD> </TR> </TABLE> <A NAME="skip-navbar_bottom"></A> <!-- ======== END OF BOTTOM NAVBAR ======= --> <HR> <i>Copyright (c) 2010 Perforce Software. All rights reserved.</i> </BODY> </HTML>