Fixed DiffListener to not check for server messages in M messages
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 a9d0765..e5d431b 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 @@
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;
}
