diff options
| author | Michael Valenta | 2004-12-01 19:44:09 +0000 |
|---|---|---|
| committer | Michael Valenta | 2004-12-01 19:44:09 +0000 |
| commit | b3d07f21a04088af5e806dc4de84a71a32157d04 (patch) | |
| tree | 10453df263ead5857884d042f33fc3aec37ca7fc /bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations | |
| parent | 37482865f01a32177815212bdd296f96de16fc37 (diff) | |
| download | eclipse.platform.team-b3d07f21a04088af5e806dc4de84a71a32157d04.tar.gz eclipse.platform.team-b3d07f21a04088af5e806dc4de84a71a32157d04.tar.xz eclipse.platform.team-b3d07f21a04088af5e806dc4de84a71a32157d04.zip | |
[79480] Merging from a date tag doesn't update the workspaceRoot_branch_20041202_Caching
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java index 018fd3c54..d0fbb2c9b 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java @@ -46,7 +46,7 @@ public class UpdateOnlyMergableOperation extends SingleCommandOperation { resources, null, monitor); - if (status.getCode() != IStatus.ERROR) { + if (status.getSeverity() != IStatus.ERROR) { addSkippedFiles(update.getSkippedFiles()); return OK; } |