Method Detail

• merge

  @Deprecated
  CDOChangeSetData merge(CDOChangeSet target,
                                      CDOChangeSet source)
                               throws UnsupportedOperationException

  Deprecated. 
  Description copied from interface: CDOMerger
  Calculates the changes between a source change set and a target change set and returns the result relative to their common ancestor.

  Specified by:

  merge in interface CDOMerger

  Throws:

  UnsupportedOperationException

  No Reference

  This method is not intended to be referenced by clients.

• merge

  void merge(CDOTransaction localTransaction,
             CDOView remoteView,
             Set<CDOID> affectedIDs)
      throws CDOMerger.ConflictException

  Throws:

  CDOMerger.ConflictException