Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-02-25 10:36:24 -0500
committerMichael Valenta2004-02-25 10:36:24 -0500
commit926b26ce40b8b89386b4b4361013b7e5486eef65 (patch)
tree36996199ec7ab5d72f50da5d29310586d755a482
parent3ccd2f8930fa282f395a1583cccdc1a2b7a4f53f (diff)
downloadeclipse.platform.team-R2_1_maintenance.tar.gz
eclipse.platform.team-R2_1_maintenance.tar.xz
eclipse.platform.team-R2_1_maintenance.zip
Fixed DiffListener to not check for server messages in M messagesR2_1_20040225R2_1_maintenance
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/DiffListener.java13
1 files changed, 5 insertions, 8 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/DiffListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/DiffListener.java
index a9d0765f5..e5d431b11 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/DiffListener.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/DiffListener.java
@@ -31,15 +31,12 @@ public class DiffListener extends CommandOutputListener {
ICVSRepositoryLocation location,
ICVSFolder commandRoot,
IProgressMonitor monitor) {
- // ignore any server messages
- if (getServerMessage(line, location) == null) {
- // Ensure that the line doesn't end with a CR.
- // This can happen if the remote file has CR/LF in it.
- if (line.length() > 0 && line.charAt(line.length() - 1) == '\r') {
- line = line.substring(0, line.length() - 1);
- }
- patchStream.println(line);
+ // Ensure that the line doesn't end with a CR.
+ // This can happen if the remote file has CR/LF in it.
+ if (line.length() > 0 && line.charAt(line.length() - 1) == '\r') {
+ line = line.substring(0, line.length() - 1);
}
+ patchStream.println(line);
return OK;
}

Back to the top