diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java index 7c14f4080..a5984d346 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java @@ -267,13 +267,13 @@ public class CVSSyncInfo extends SyncInfo { * </ul> * </ul> */ - public IStatus makeInSync() throws CVSException { - - // Only works on folders + public IStatus makeInSync() throws CVSException { + + // Only works on folders if (getLocal().getType() == IResource.FILE) { return new CVSStatus(IStatus.WARNING, INVALID_RESOURCE_TYPE, NLS.bind(CVSMessages.CVSSyncInfo_7, new String[] { getLocal().getFullPath().toString()}), getLocal()); } - + // Only works on outgoing and conflicting changes boolean outgoing = (getKind() & DIRECTION_MASK) == OUTGOING; if (outgoing) { @@ -318,9 +318,9 @@ public class CVSSyncInfo extends SyncInfo { // It is also impossible for an incomming folder to be static. FolderSyncInfo remoteInfo = remote.getFolderSyncInfo(); FolderSyncInfo localInfo = local.getParent().getFolderSyncInfo(); - MutableFolderSyncInfo newInfo = remoteInfo.cloneMutable(); - newInfo.setTag(localInfo.getTag()); - newInfo.setStatic(false); + MutableFolderSyncInfo newInfo = remoteInfo.cloneMutable(); + newInfo.setTag(localInfo.getTag()); + newInfo.setStatic(false); local.setFolderSyncInfo(newInfo); return Status.OK_STATUS; } |