Class containing the context for an individual merge during execution of
a p4 resolve
.
Returns the name of "your" file in the merge. This is typically a path to a file in the workspace.
Returns the name of "their" file in the merge. This is typically a path to a file in the depot.
Returns the name of the "base" file in the merge. This is typically a path to a file in the depot.
Returns the path of "your" file in the merge. This is typically a path to a file in the workspace.
Returns the path of "their" file in the merge. This is typically a path
to a temporary file on your local machine in which the contents of
their_name
have been loaded.
Returns the path of the base file in the merge. This is typically a path
to a temporary file on your local machine in which the contents of
base_name
have been loaded.
Returns the path to the merge result. This is typically a path to a temporary file on your local machine in which the contents of the automatic merge performed by the server have been loaded.
Returns the hint from the server as to how it thinks you might best resolve this merge.
If the environment variable P4MERGE
is defined,
md.run_merge()
invokes the specified program and returns a
boolean based on the return value of that program.