public int compareTo(FSID otherID) { if (otherID == null) { return -1; } else if (otherID.equals(this)) { return 0; } return isRelated(otherID) ? 1 : -1; }
public int compareTo(FSID otherID) { if (otherID == null) { return -1; } else if (otherID.equals(this)) { return 0; } return isRelated(otherID) ? 1 : -1; }
public int compareTo(FSID otherID) { if (otherID == null) { return -1; } else if (otherID.equals(this)) { return 0; } return isRelated(otherID) ? 1 : -1; }
public int compareTo(FSID otherID) { if (otherID == null) { return -1; } else if (otherID.equals(this)) { return 0; } return isRelated(otherID) ? 1 : -1; }
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); } }
FSID ancestorId = ancestor.getId(); if (ancestorId.equals(targetId)) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.FS_GENERAL, "Bad merge; target ''{0}'' has id ''{1}'', same as ancestor", new Object[] { targetPath, targetId if (ancestorId.equals(sourceId) || sourceId.equals(targetId)) { return; FSEntry sourceEntry = (FSEntry) sourceEntries.get(ancestorEntryName); FSEntry targetEntry = (FSEntry) targetEntries.get(ancestorEntryName); if (sourceEntry != null && ancestorEntry.getId().equals(sourceEntry.getId())) { } else if (targetEntry != null && ancestorEntry.getId().equals(targetEntry.getId())) { if (sourceEntry != null) { myTxnRoot.setEntry(target, ancestorEntryName, sourceEntry.getId(), sourceEntry.getType());
SVNErrorManager.error(err); if ((change.getRevNodeId() != null) && (!oldChange.getRevNodeId().equals(change.getRevNodeId())) && (oldChange.getChangeKind() != FSPathChangeKind.FS_PATH_CHANGE_DELETE)) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.FS_CORRUPT, "Invalid change ordering: new node revision ID without delete"); SVNErrorManager.error(err);
public void makeCopy(FSRevisionRoot fromRoot, String fromPath, String toPath, boolean preserveHistory) throws SVNException { String txnId = myTxnRoot.getTxnID(); FSRevisionNode fromNode = fromRoot.getRevisionNode(fromPath); FSParentPath toParentPath = myTxnRoot.openPath(toPath, false, true); if ((myTxnRoot.getTxnFlags() & FSTransactionRoot.SVN_FS_TXN_CHECK_LOCKS) != 0) { FSCommitter.allowLockedOperation(myFSFS, toPath, myAuthor, myLockTokens, true, false); } if (toParentPath.getRevNode() != null && toParentPath.getRevNode().getId().equals(fromNode.getId())) { return; } FSPathChangeKind changeKind; if (toParentPath.getRevNode() != null) { changeKind = FSPathChangeKind.FS_PATH_CHANGE_REPLACE; } else { changeKind = FSPathChangeKind.FS_PATH_CHANGE_ADD; } makePathMutable(toParentPath.getParent(), toPath); String fromCanonPath = fromPath; copy(toParentPath.getParent().getRevNode(), toParentPath.getNameEntry(), fromNode, preserveHistory, fromRoot.getRevision(), fromCanonPath, txnId); if (changeKind == FSPathChangeKind.FS_PATH_CHANGE_REPLACE) { myTxnRoot.removeRevNodeFromCache(toParentPath.getAbsPath()); } FSRevisionNode newNode = myTxnRoot.getRevisionNode(toPath); addChange(toPath, newNode.getId(), changeKind, false, false, fromRoot.getRevision(), fromCanonPath); }
SVNErrorManager.error(err, SVNLogType.FSFS); if ((change.getRevNodeId() != null) && (!oldChange.getRevNodeId().equals(change.getRevNodeId())) && (oldChange.getChangeKind() != FSPathChangeKind.FS_PATH_CHANGE_DELETE)) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.FS_CORRUPT, "Invalid change ordering: new node revision ID without delete"); SVNErrorManager.error(err, SVNLogType.FSFS);
SVNErrorManager.error(err, SVNLogType.FSFS); if ((change.getRevNodeId() != null) && (!oldChange.getRevNodeId().equals(change.getRevNodeId())) && (oldChange.getChangeKind() != FSPathChangeKind.FS_PATH_CHANGE_DELETE)) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.FS_CORRUPT, "Invalid change ordering: new node revision ID without delete"); SVNErrorManager.error(err, SVNLogType.FSFS);
FSTransactionInfo txn = myTxnRoot.getTxn(); if (txn.getRootID().equals(txn.getBaseID())) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, "FATAL error: txn ''{0}'' root id ''{1}'' matches base id ''{2}''", new Object[] { txnId, txn.getRootID(), txn.getBaseID()
if (toParentPath.getRevNode() != null && toParentPath.getRevNode().getId().equals(fromNode.getId())) { return;
if (toParentPath.getRevNode() != null && toParentPath.getRevNode().getId().equals(fromNode.getId())) { return;
if (toParentPath.getRevNode() != null && toParentPath.getRevNode().getId().equals(fromNode.getId())) { return;
FSTransactionInfo txn = myTxnRoot.getTxn(); if (txn.getRootID().equals(txn.getBaseID())) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, "FATAL error: txn ''{0}'' root id ''{1}'' matches base id ''{2}''",
FSTransactionInfo txn = txnRoot.getTxn(); if (txn.getRootID().equals(txn.getBaseID())) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, "FATAL error: txn ''{0}'' root id ''{1}'' matches base id ''{2}''",
FSTransactionInfo txn = myTxnRoot.getTxn(); if (txn.getRootID().equals(txn.getBaseID())) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.UNKNOWN, "FATAL error: txn ''{0}'' root id ''{1}'' matches base id ''{2}''",