OdTfPostponeMergeHandler Struct Reference

#include <TfRevisionControl.h>

Inheritance diagram for OdTfPostponeMergeHandler:

Classes
struct	Conflict

Public Types
typedef OdArray< Conflict >	Conflicts

Public Member Functions
Conflicts const &	conflicts () const
Conflicts &	conflicts ()
OdTfRevisionControl::MergeResolution	operator() (const OdDbHandle &h, OdTfRevisionControl::ChangeType myChange, OdTfRevisionControl::ChangeType theirChange, OdTfRevisionControl::MergeResolution autoResolution) override
virtual OdTfRevisionControl::MergeResolution	operator() (const OdDbHandle &h, OdTfRevisionControl::ChangeType myChange, OdTfRevisionControl::ChangeType theirChange, OdTfRevisionControl::MergeResolution autoResolution)=0

Detailed Description

OdTfMergeConflictHandler implementation collecting all conflicts for resolving after the merge() operation finished.

Definition at line 357 of file TfRevisionControl.h.

Member Typedef Documentation

Conflicts

typedef OdArray<Conflict> OdTfPostponeMergeHandler::Conflicts

Definition at line 369 of file TfRevisionControl.h.

Member Function Documentation

conflicts() [1/2]

Conflicts & OdTfPostponeMergeHandler::conflicts ( )

inline

Definition at line 372 of file TfRevisionControl.h.

conflicts() [2/2]

Conflicts const & OdTfPostponeMergeHandler::conflicts ( ) const

inline

Definition at line 371 of file TfRevisionControl.h.

operator()()

OdTfRevisionControl::MergeResolution OdTfPostponeMergeHandler::operator() ( const OdDbHandle &  h, OdTfRevisionControl::ChangeType  myChange, OdTfRevisionControl::ChangeType  theirChange, OdTfRevisionControl::MergeResolution  autoResolution  )

inlineoverridevirtual

Implements OdTfMergeHandler.

Definition at line 374 of file TfRevisionControl.h.

---

The documentation for this struct was generated from the following file:

• TfRevisionControl.h