public class P4Resolve extends P4Base
failOnError, P4Client, P4CmdOpts, P4Opts, P4Port, P4User, P4View, shell, util
description, location, project
Constructor and Description |
---|
P4Resolve() |
Modifier and Type | Method and Description |
---|---|
void |
execute()
execute the p4 resolve
|
java.lang.String |
getResolvemode()
returns the resolve mode
|
boolean |
isForcetextmode()
If set to true, attempts a textual merge, even for binary files
|
boolean |
isMarkersforall()
If set to true, puts in markers for all changes, conflicting or not
|
boolean |
isRedoall()
allows previously resolved files to be resolved again
|
boolean |
isSimulationmode()
read the simulation mode flag
|
void |
setForcetextmode(boolean forcetextmode)
If set to true, attempts a textual merge, even for binary files
|
void |
setMarkersforall(boolean markersforall)
If set to true, puts in markers for all changes, conflicting or not
|
void |
setRedoall(boolean redoall)
set the redoall flag
|
void |
setResolvemode(java.lang.String resolvemode)
values for resolvemode
automatic -am
force -af
safe -as
theirs -at
yours -ay
|
void |
setSimulationmode(boolean simulationmode)
sets a flag
|
execP4Command, execP4Command, getErrorMessage, getInError, init, setClient, setCmdopts, setErrorMessage, setFailonerror, setGlobalopts, setInError, setPort, setUser, setView
bindToOwner, getOwningTarget, getRuntimeConfigurableWrapper, getTaskName, getTaskType, getWrapper, handleErrorFlush, handleErrorOutput, handleFlush, handleInput, handleOutput, isInvalid, log, log, log, log, maybeConfigure, perform, reconfigure, setOwningTarget, setRuntimeConfigurableWrapper, setTaskName, setTaskType
clone, getDescription, getLocation, getProject, setDescription, setLocation, setProject
public java.lang.String getResolvemode()
public void setResolvemode(java.lang.String resolvemode)
resolvemode
- one of automatic, force, safe, theirs, yourspublic boolean isRedoall()
public void setRedoall(boolean redoall)
redoall
- flag indicating whether one want to
allow previously resolved files to be resolved againpublic boolean isSimulationmode()
public void setSimulationmode(boolean simulationmode)
simulationmode
- set to true, lists the integrations which would be performed,
without actually doing them.public boolean isForcetextmode()
public void setForcetextmode(boolean forcetextmode)
forcetextmode
- set the flag valuepublic boolean isMarkersforall()
public void setMarkersforall(boolean markersforall)
markersforall
- flag true or falsepublic void execute() throws BuildException
execute
in class Task
BuildException
- if there is a wrong resolve mode specified
or no view specified