Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2003-10-20 17:25:41 +0000
committerMichael Valenta2003-10-20 17:25:41 +0000
commita8fca2ec1ded9b343cef3eff7a6df4adca6a2515 (patch)
tree0abcaaaf79ef812d3d089646f79190100684d8d4
parent304672e0ec7b874495c19655c1b02cd5a7fe5591 (diff)
downloadeclipse.platform.team-a8fca2ec1ded9b343cef3eff7a6df4adca6a2515.tar.gz
eclipse.platform.team-a8fca2ec1ded9b343cef3eff7a6df4adca6a2515.tar.xz
eclipse.platform.team-a8fca2ec1ded9b343cef3eff7a6df4adca6a2515.zip
40890: Eclipse CVS client does not recognize Baserev entries from other clientsI20031021
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/BaserevInfo.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/BaserevInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/BaserevInfo.java
index 3166344a3..41ebfb14a 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/BaserevInfo.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/BaserevInfo.java
@@ -41,6 +41,7 @@ public class BaserevInfo {
result.append(name);
result.append(ResourceSyncInfo.SEPARATOR);
result.append(revision);
+ result.append(ResourceSyncInfo.SEPARATOR);
return result.toString();
}
private void setEntryLine(String entryLine) throws CVSException {
@@ -48,7 +49,9 @@ public class BaserevInfo {
entryLine = entryLine.substring(1);
}
String[] strings = Util.parseIntoSubstrings(entryLine, ResourceSyncInfo.SEPARATOR);
- if(strings.length != 2) {
+ // Accept either a length of 2 or 3. If the length is 3, we ignore the last
+ // string as per the CVS spec.
+ if(strings.length != 2 && strings.length != 3) {
throw new CVSException(Policy.bind("BaseRevInfo.malformedEntryLine", entryLine)); //$NON-NLS-1$
}

Back to the top