#include <TfRevisionControl.h>
Public Member Functions | |
| virtual OdTfRevisionControl::MergeResolution | operator() (const OdDbHandle &h, OdTfRevisionControl::ChangeType myChange, OdTfRevisionControl::ChangeType theirChange, OdTfRevisionControl::MergeResolution autoResolution)=0 |
Detailed Description
Merge handler interface for use with merge() and dryMerge() methods.
This handler will be called for each change of each side encountered during a merge operation. It can be used to resolve the actual conflicts or to approve on any change. The myChange and theirChange parameter indicate the case. OdTfRevisionControl::isConflict() can be used to determine if the case is a conflict case.
Returning a resolution preferring a side for which the object was removed, will remove the object from the resulting merged database.
When returning OdTfRevisionControl::kMergePostpone it is intended that this handler records the conflicts for resolving them later in a manual way after the merge operation finished.
- Parameters
-
h [in] Handle of the (conflicting) object in my, their and base database/revision. myChange [in] Change type of the object in my database/revision compared to the base revision. theirChange [in] Change of the object in their revision compared to the base revision. autoResolution [in] Proposed resolution if the conflict can be resolved automatically. OdTfRevisionControl::kMergeNoResolution if the conflict can not be resolved automatically and requires an explicit decision.
- Returns
- Resolution for the conflict.
- See also
- OdTfFixedMergeConflictHandler OdTfPostponeMergeConflictHandler
Definition at line 319 of file TfRevisionControl.h.
Member Function Documentation
◆ operator()()
|
pure virtual |
Implemented in OdTfFixedMergeHandler< conflictResolution >, and OdTfPostponeMergeHandler.
The documentation for this struct was generated from the following file: