ThreeWayConflictHandler.Resolution |
ThreeWayConflictHandler.addExistingNode(NodeBuilder parent,
String name,
NodeState ours,
NodeState theirs)
The node ours has been added to parent which conflicts
with node theirs which has been added in the persistence store.
|
ThreeWayConflictHandler.Resolution |
CompositeConflictHandler.addExistingNode(NodeBuilder parent,
String name,
NodeState ours,
NodeState theirs) |
ThreeWayConflictHandler.Resolution |
ThreeWayConflictHandler.addExistingProperty(NodeBuilder parent,
org.apache.jackrabbit.oak.api.PropertyState ours,
org.apache.jackrabbit.oak.api.PropertyState theirs)
The property ours has been added to parent which conflicts
with property theirs which has been added in the persistence store.
|
ThreeWayConflictHandler.Resolution |
CompositeConflictHandler.addExistingProperty(NodeBuilder parent,
org.apache.jackrabbit.oak.api.PropertyState ours,
org.apache.jackrabbit.oak.api.PropertyState theirs) |
ThreeWayConflictHandler.Resolution |
ThreeWayConflictHandler.changeChangedProperty(NodeBuilder parent,
org.apache.jackrabbit.oak.api.PropertyState ours,
org.apache.jackrabbit.oak.api.PropertyState theirs,
org.apache.jackrabbit.oak.api.PropertyState base)
The property ours has been changed in parent while it was
also changed to a different value (theirs) in the persistence store.
|
ThreeWayConflictHandler.Resolution |
CompositeConflictHandler.changeChangedProperty(NodeBuilder parent,
org.apache.jackrabbit.oak.api.PropertyState ours,
org.apache.jackrabbit.oak.api.PropertyState theirs,
org.apache.jackrabbit.oak.api.PropertyState base) |
ThreeWayConflictHandler.Resolution |
ThreeWayConflictHandler.changeDeletedNode(NodeBuilder parent,
String name,
NodeState ours,
NodeState base)
The node ours has been changed in parent while it was
removed in the persistence store.
|
ThreeWayConflictHandler.Resolution |
CompositeConflictHandler.changeDeletedNode(NodeBuilder parent,
String name,
NodeState ours,
NodeState base) |
ThreeWayConflictHandler.Resolution |
ThreeWayConflictHandler.changeDeletedProperty(NodeBuilder parent,
org.apache.jackrabbit.oak.api.PropertyState ours,
org.apache.jackrabbit.oak.api.PropertyState base)
The property ours has been changed in parent while it was
removed in the persistence store.
|
ThreeWayConflictHandler.Resolution |
CompositeConflictHandler.changeDeletedProperty(NodeBuilder parent,
org.apache.jackrabbit.oak.api.PropertyState ours,
org.apache.jackrabbit.oak.api.PropertyState base) |
ThreeWayConflictHandler.Resolution |
ThreeWayConflictHandler.deleteChangedNode(NodeBuilder parent,
String name,
NodeState theirs,
NodeState base)
The node theirs changed in the persistence store while it has been
deleted locally.
|
ThreeWayConflictHandler.Resolution |
CompositeConflictHandler.deleteChangedNode(NodeBuilder parent,
String name,
NodeState theirs,
NodeState base) |
ThreeWayConflictHandler.Resolution |
ThreeWayConflictHandler.deleteChangedProperty(NodeBuilder parent,
org.apache.jackrabbit.oak.api.PropertyState theirs,
org.apache.jackrabbit.oak.api.PropertyState base)
The property theirs changed in the persistence store while it has been
deleted locally.
|
ThreeWayConflictHandler.Resolution |
CompositeConflictHandler.deleteChangedProperty(NodeBuilder parent,
org.apache.jackrabbit.oak.api.PropertyState theirs,
org.apache.jackrabbit.oak.api.PropertyState base) |
ThreeWayConflictHandler.Resolution |
ThreeWayConflictHandler.deleteDeletedNode(NodeBuilder parent,
String name,
NodeState base)
The node name has been removed in parent while it was
also removed in the persistence store.
|
ThreeWayConflictHandler.Resolution |
CompositeConflictHandler.deleteDeletedNode(NodeBuilder parent,
String name,
NodeState base) |
ThreeWayConflictHandler.Resolution |
ThreeWayConflictHandler.deleteDeletedProperty(NodeBuilder parent,
org.apache.jackrabbit.oak.api.PropertyState base)
The property ours has been removed in parent while it was
also removed in the persistence store.
|
ThreeWayConflictHandler.Resolution |
CompositeConflictHandler.deleteDeletedProperty(NodeBuilder parent,
org.apache.jackrabbit.oak.api.PropertyState base) |
static ThreeWayConflictHandler.Resolution |
ThreeWayConflictHandler.Resolution.valueOf(String name)
Returns the enum constant of this type with the specified name.
|
static ThreeWayConflictHandler.Resolution[] |
ThreeWayConflictHandler.Resolution.values()
Returns an array containing the constants of this enum type, in
the order they are declared.
|