summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorChristian Georgi2013-06-02 06:25:31 (EDT)
committer Gerrit Code Review @ Eclipse.org2013-06-10 11:06:57 (EDT)
commitbaae29fef6bf4c8cf067f72b7589428c95a9dc70 (patch)
tree0e9510f37ec563c4d1bb8afcf493f220563c0e95
parente8d0db7b59b88e9b055f67bddb1445ff406e1e57 (diff)
downloadegit-baae29fef6bf4c8cf067f72b7589428c95a9dc70.zip
egit-baae29fef6bf4c8cf067f72b7589428c95a9dc70.tar.gz
egit-baae29fef6bf4c8cf067f72b7589428c95a9dc70.tar.bz2
Allow incremental project set importrefs/changes/69/13469/3
By checking if the project to import already exists. Previously the import operation aborted on the first existing project, making incremental workspace population impossible. Bug: 409672 Change-Id: I9e10900b9b815563e1da678d4562e98a0504cf51
-rw-r--r--org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java
index fc15b29..83e8958 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java
@@ -272,8 +272,10 @@ public class ProjectReferenceImporter {
.append(IProjectDescription.DESCRIPTION_FILE_NAME));
final IProject project = root.getProject(projectDescription
.getName());
- project.create(projectDescription, monitor);
- importedProjects.add(project);
+ if (!project.exists()) {
+ project.create(projectDescription, monitor);
+ importedProjects.add(project);
+ }
project.open(monitor);
final ConnectProviderOperation connectProviderOperation = new ConnectProviderOperation(