diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/StickyHandler.java')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/StickyHandler.java | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/StickyHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/StickyHandler.java index b94325e76..48fe582ff 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/StickyHandler.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/StickyHandler.java @@ -66,24 +66,24 @@ class StickyHandler extends ResponseHandler { Assert.isTrue(repositoryDir.endsWith("/")); //$NON-NLS-1$ repositoryDir = repositoryDir.substring(0, repositoryDir.length() - 1); try { - ICVSFolder folder = createFolder(session, localDir, repositoryDir); - FolderSyncInfo syncInfo = folder.getFolderSyncInfo(); - // Added to ignore sync info for workspace root - if (syncInfo == null) return; - MutableFolderSyncInfo newInfo = syncInfo.cloneMutable(); - newInfo.setTag(tag != null ? new CVSEntryLineTag(tag) : null); - /* if we are reverting to BASE we do not change anything here - * see bug 106876 */ - if(tag != null && tag.equals("TBASE")) //$NON-NLS-1$ - newInfo.setTag(syncInfo.getTag()); - // only set the sync info if it has changed - if (!syncInfo.equals(newInfo)) - folder.setFolderSyncInfo(newInfo); - } catch (CVSException e) { - if (!handleInvalidResourceName(session, session.getLocalRoot().getFolder(localDir), e)) { - throw e; - } - } + ICVSFolder folder = createFolder(session, localDir, repositoryDir); + FolderSyncInfo syncInfo = folder.getFolderSyncInfo(); + // Added to ignore sync info for workspace root + if (syncInfo == null) return; + MutableFolderSyncInfo newInfo = syncInfo.cloneMutable(); + newInfo.setTag(tag != null ? new CVSEntryLineTag(tag) : null); + /* if we are reverting to BASE we do not change anything here + * see bug 106876 */ + if(tag != null && tag.equals("TBASE")) //$NON-NLS-1$ + newInfo.setTag(syncInfo.getTag()); + // only set the sync info if it has changed + if (!syncInfo.equals(newInfo)) + folder.setFolderSyncInfo(newInfo); + } catch (CVSException e) { + if (!handleInvalidResourceName(session, session.getLocalRoot().getFolder(localDir), e)) { + throw e; + } + } } } |