public static void mergeChanges(FSFS owner, FSTransactionRoot txnRoot, FSRevisionNode sourceNode, StringBuffer conflictPath) throws SVNException { FSRevisionNode txnRootNode = txnRoot.getRootRevisionNode(); FSRevisionNode ancestorNode = txnRoot.getTxnBaseRootNode(); if (txnRootNode.getId().equals(ancestorNode.getId())) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, "FATAL error: no changes in transaction to commit"); SVNErrorManager.error(err, SVNLogType.FSFS); } else { merge(owner, "/", txnRootNode, sourceNode, ancestorNode, txnRoot, conflictPath); } }
private void mergeChanges(FSRevisionNode ancestorNode, FSRevisionNode sourceNode, StringBuffer conflictPath) throws SVNException { String txnId = myTxn.getTxnId(); FSRevisionNode txnRootNode = myTxnRoot.getRootRevisionNode(); if (ancestorNode == null) { ancestorNode = myTxnRoot.getTxnBaseRootNode(); } if (txnRootNode.getId().equals(ancestorNode.getId())) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, "FATAL error: no changes in transaction to commit"); SVNErrorManager.error(err, SVNLogType.FSFS); } else { merge("/", txnRootNode, sourceNode, ancestorNode, txnId, conflictPath); } }
private void mergeChanges(FSRevisionNode ancestorNode, FSRevisionNode sourceNode) throws SVNException { String txnId = myTxn.getTxnId(); FSRevisionNode txnRootNode = myTxnRoot.getRootRevisionNode(); if (ancestorNode == null) { ancestorNode = myTxnRoot.getTxnBaseRootNode(); } if (txnRootNode.getId().equals(ancestorNode.getId())) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, "FATAL error: no changes in transaction to commit"); SVNErrorManager.error(err); } else { merge("/", txnRootNode, sourceNode, ancestorNode, txnId); } }
private void mergeChanges(FSRevisionNode ancestorNode, FSRevisionNode sourceNode, StringBuffer conflictPath) throws SVNException { String txnId = myTxn.getTxnId(); FSRevisionNode txnRootNode = myTxnRoot.getRootRevisionNode(); if (ancestorNode == null) { ancestorNode = myTxnRoot.getTxnBaseRootNode(); } if (txnRootNode.getId().equals(ancestorNode.getId())) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, "FATAL error: no changes in transaction to commit"); SVNErrorManager.error(err, SVNLogType.FSFS); } else { merge("/", txnRootNode, sourceNode, ancestorNode, txnId, conflictPath); } }
FSRevisionNode ancestorEntryNode = myFSFS.getRevisionNode(ancestorEntry.getId()); String childTargetPath = SVNPathUtil.concatToAbs(targetPath, targetEntry.getName()); merge(childTargetPath, targetEntryNode, sourceEntryNode, ancestorEntryNode, txnId);
FSRevisionNode ancestorEntryNode = owner.getRevisionNode(ancestorEntry.getId()); String childTargetPath = SVNPathUtil.getAbsolutePath(SVNPathUtil.append(targetPath, targetEntry.getName())); long subMergeInfoIncrement = merge(owner, childTargetPath, targetEntryNode, sourceEntryNode, ancestorEntryNode, txnRoot, conflictPath); if (owner.supportsMergeInfo()) { mergeInfoIncrement += subMergeInfoIncrement;
FSRevisionNode ancestorEntryNode = myFSFS.getRevisionNode(ancestorEntry.getId()); String childTargetPath = SVNPathUtil.getAbsolutePath(SVNPathUtil.append(targetPath, targetEntry.getName())); long subMergeInfoIncrement = merge(childTargetPath, targetEntryNode, sourceEntryNode, ancestorEntryNode, txnId, conflictPath); if (myFSFS.supportsMergeInfo()) { mergeInfoIncrement += subMergeInfoIncrement;
FSRevisionNode ancestorEntryNode = myFSFS.getRevisionNode(ancestorEntry.getId()); String childTargetPath = SVNPathUtil.getAbsolutePath(SVNPathUtil.append(targetPath, targetEntry.getName())); long subMergeInfoIncrement = merge(childTargetPath, targetEntryNode, sourceEntryNode, ancestorEntryNode, txnId, conflictPath); if (myFSFS.supportsMergeInfo()) { mergeInfoIncrement += subMergeInfoIncrement;