Class P4_Resolver

Description

P4_Resolver is a class for handling resolves in Perforce. It must be subclassed, to be used; subclasses can override the P4::resolve() method. When P4::run_resolve() is called with a P4_Resolver object, it calls the P4_Resolver::resolve() method of the object once for each scheduled resolve.

Properties

None.

Static Methods

None.

Instance Methods

$resolver->resolve( self, mergeData ) -> string

Returns the resolve decision as a string. The standard Perforce resolve strings apply:

String

Meaning

ay

Accept Yours.

at

Accept Theirs.

am

Accept Merge result.

ae

Accept Edited result.

s

Skip this merge.

q

Abort the merge.

By default, all automatic merges are accepted, and all merges with conflicts are skipped. The P4_Resolver::resolve() method is called with a single parameter, which is a reference to a P4_MergeData object.