Class P4.Resolver

Description

P4.Resolver is a class for handling resolves in P4 Server. It is intended to be subclassed, and for subclasses to override the 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.

Instance Attributes

None.

Class Methods

None.

Instance Methods

resolver.resolve( self, mergeData ) -> string

Returns the resolve decision as a string. The standard P4 Server 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.