You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2013/02/07 11:40:47 UTC
svn commit: r1443393 -
/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/RebaseCommand.java
Author: mduerig
Date: Thu Feb 7 10:40:47 2013
New Revision: 1443393
URL: http://svn.apache.org/viewvc?rev=1443393&view=rev
Log:
OAK-536: Implement rebase for branches in Microkernel
remove unused parameter
Modified:
jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/RebaseCommand.java
Modified: jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/RebaseCommand.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/RebaseCommand.java?rev=1443393&r1=1443392&r2=1443393&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/RebaseCommand.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/RebaseCommand.java Thu Feb 7 10:40:47 2013
@@ -169,7 +169,7 @@ public class RebaseCommand extends BaseC
NodeState theirState = theirDelta.getAddedChildNodes().get(name);
if (theirState != null && !theirState.equals(ourState)) {
- markConflict(stagedNode, "addExistingNode", name, ourState);
+ markConflict(stagedNode, "addExistingNode", ourState);
}
else {
stagedNode.addChildNodeEntry(unwrap(ourState));
@@ -181,10 +181,10 @@ public class RebaseCommand extends BaseC
NodeState ourState = removed.getValue();
if (theirDelta.getRemovedChildNodes().containsKey(name)) {
- markConflict(stagedNode, "deleteDeletedNode", name, ourState);
+ markConflict(stagedNode, "deleteDeletedNode", ourState);
}
else if (theirDelta.getChangedChildNodes().containsKey(name)) {
- markConflict(stagedNode, "deleteChangedNode", name, ourState);
+ markConflict(stagedNode, "deleteChangedNode", ourState);
}
else {
stagedNode.removeChildNodeEntry(name);
@@ -197,7 +197,7 @@ public class RebaseCommand extends BaseC
Node changedBase = baseNode.getChildNodeEntry(name);
if (changedBase == null) {
- markConflict(stagedNode, "changeDeletedNode", name, ourState);
+ markConflict(stagedNode, "changeDeletedNode", ourState);
continue;
}
@@ -219,7 +219,7 @@ public class RebaseCommand extends BaseC
marker.getProperties().put(name, ourValue);
}
- private static void markConflict(NodeImpl parent, String conflictType, String name, NodeState ourState) {
+ private static void markConflict(NodeImpl parent, String conflictType, NodeState ourState) {
NodeImpl marker = getOrAddConflictMarker(parent, conflictType);
marker.addChildNodeEntry(unwrap(ourState));
}