diff options
| author | Bogdan Gheorghe | 2006-04-27 15:38:15 +0000 |
|---|---|---|
| committer | Bogdan Gheorghe | 2006-04-27 15:38:15 +0000 |
| commit | f45c114c6b4b5c8820189ff9e76dfe2252c075b1 (patch) | |
| tree | 678c640f6e3556a56fa66bba069492dfa33a0575 | |
| parent | 710ca8115658921236dfbc98556b74e84e8ef2c9 (diff) | |
| download | eclipse.platform.team-f45c114c6b4b5c8820189ff9e76dfe2252c075b1.tar.gz eclipse.platform.team-f45c114c6b4b5c8820189ff9e76dfe2252c075b1.tar.xz eclipse.platform.team-f45c114c6b4b5c8820189ff9e76dfe2252c075b1.zip | |
Bug 138902 CVS synchronize operation marks file as 'edited'I200604271155
| -rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java index a48154f4b..b6bbf58e6 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java @@ -423,4 +423,21 @@ public class WorkspaceSubscriberContext extends CVSSubscriberMergeContext { } return tree; } + + protected void performReplace(IDiff diff, IProgressMonitor monitor) throws CoreException { + IResource resource = ResourceDiffTree.getResourceFor(diff); + if (resource.getType() == IResource.FILE){ + IFile file = (IFile) resource; + ICVSFile mFile = CVSWorkspaceRoot.getCVSFileFor(file); + try { + // The file may have been set as read-only by a previous checkout/update + if (mFile.isReadOnly()) mFile.setReadOnly(false); + } catch (CVSException e) { + // Just log and keep going + CVSProviderPlugin.log(e); + } + } + super.performReplace(diff, monitor); + + } }
\ No newline at end of file |