diff options
author | Michael Valenta | 2002-05-14 18:13:44 +0000 |
---|---|---|
committer | Michael Valenta | 2002-05-14 18:13:44 +0000 |
commit | 522b5020ac6e44d5a79338a25679d1cdedbc65e3 (patch) | |
tree | 91929d0a9b02158a6b61427b82b403e4a6873b52 /bundles | |
parent | 9db8586d998a14191aeed17b1fa2e5b55ce1efa5 (diff) | |
download | eclipse.platform.team-522b5020ac6e44d5a79338a25679d1cdedbc65e3.tar.gz eclipse.platform.team-522b5020ac6e44d5a79338a25679d1cdedbc65e3.tar.xz eclipse.platform.team-522b5020ac6e44d5a79338a25679d1cdedbc65e3.zip |
15951: Can't get remote when syncing on new file
Diffstat (limited to 'bundles')
-rw-r--r-- | bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java index f948a9c2e..5a06f58f5 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java @@ -267,7 +267,9 @@ public class RemoteFolderTreeBuilder { RemoteFile remoteFile; Map deltas = (Map)fileDeltas.get(Path.EMPTY); if (deltas == null || deltas.isEmpty()) { - if (file.isManaged() && file.getSyncInfo().isAdded()) { + // If the file is an addition, return null as the remote + // Note: If there was a conflicting addition, the delta would not be empty + if ( ! file.isManaged() || file.getSyncInfo().isAdded()) { return null; } remoteFile = new RemoteFile(remoteRoot, file.getSyncInfo()); |