[ https://issues.jboss.org/browse/JBIDE-10479?page=com.atlassian.jira.plugi... ] Andre Dietisheim commented on JBIDE-10479: ------------------------------------------ Since there's no RECURSIVE merging strategy available for egit/jgit, we'd have to push force to the remote imho. I see the following approach: * add the openshift repo as remote repo * add .openshift folder * add openshift profile to pom * push force to openshift -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.jboss.org/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira

[ https://issues.jboss.org/browse/JBIDE-10479?page=com.atlassian.jira.plugi... ] Andre Dietisheim edited comment on JBIDE-10479 at 12/19/11 5:08 PM: -------------------------------------------------------------------- I had a quick look at other possible alternatives, but none of the works with jgit: * we could checkout individual from OpenShift clone to the current master branch in the project: CLI git can checkout individual files, jgit isn't capable of that so far. * cherry picking seems possible on commits, not on individual files * ... was (Author: adietish): I had a quick look at other possible alternatives, but none of the works with jgit: * we could checkout individual from OpenShift clone to the current master branch in the project: CLI git can checkout individual files, jgit isn't capable of that so far. * cherry picking seems possible on commits, not on individual files * ... -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.jboss.org/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira

[ https://issues.jboss.org/browse/JBIDE-10479?page=com.atlassian.jira.plugi... ] Andre Dietisheim edited comment on JBIDE-10479 at 12/20/11 9:19 AM: -------------------------------------------------------------------- Since there's no RECURSIVE merging strategy available for egit/jgit, we'd have to push force to the remote imho. I see the following approach: * add the openshift repo as remote repo * add deployments folder * add .openshift folder * add openshift profile to pom * push force to openshift was (Author: adietish): Since there's no RECURSIVE merging strategy available for egit/jgit, we'd have to push force to the remote imho. I see the following approach: * add the openshift repo as remote repo * add .openshift folder * add openshift profile to pom * push force to openshift -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.jboss.org/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira

[ https://issues.jboss.org/browse/JBIDE-10479?page=com.atlassian.jira.plugi... ] Andre Dietisheim commented on JBIDE-10479: ------------------------------------------ The usecase is pretty much implemented and committed. I'm now testing it intesively. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.jboss.org/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira

[ https://issues.jboss.org/browse/JBIDE-10479?page=com.atlassian.jira.plugi... ] Andre Dietisheim edited comment on JBIDE-10479 at 1/20/12 4:56 PM: ------------------------------------------------------------------- 1.) still missing are the following 2 use cases: * Import project that is git-shared and is already bound to an OpenShift app (for as7/java apps: has .openshift): * if created with rhc-tooling * if created with JBT 2.) The import of git-shared project (that is not bound to an OpenShift app - no .openshift) is not cancelling yet if there's a .openshift folder. Thinking this through, I see that we need to know about the OpenShift-specific folders/configs that exist for the different app-types: * java/as7: .openshift, deployments * php: ... * ruby: ... was (Author: adietish): # still missing are the following 2 use cases: * Import project that is git-shared and is already bound to an OpenShift app (for as7/java apps: has .openshift): * if created with rhc-tooling * if created with JBT # The import of git-shared project (that is not bound to an OpenShift app - no .openshift) is not cancelling yet if there's a .openshift folder. Thinking this through, I see that we need to know about the OpenShift-specific folders/configs that exist for the different app-types: * java/as7: .openshift, deployments * php: ... * ruby: ... -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.jboss.org/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira

[ https://issues.jboss.org/browse/JBIDE-10479?page=com.atlassian.jira.plugi... ] Andre Dietisheim edited comment on JBIDE-10479 at 1/20/12 4:57 PM: ------------------------------------------------------------------- 1.) still missing are the following 2 use cases: * Import project that is git-shared and is already bound to an OpenShift app (for as7/java apps: has .openshift): ** if created with rhc-tooling ** if created with JBT 2.) The import of git-shared project (that is not bound to an OpenShift app - no .openshift) is not cancelling yet if there's a .openshift folder. Thinking this through, I see that we need to know about the OpenShift-specific folders/configs that exist for the different app-types: * java/as7: .openshift, deployments * php: ... * ruby: ... was (Author: adietish): 1.) still missing are the following 2 use cases: * Import project that is git-shared and is already bound to an OpenShift app (for as7/java apps: has .openshift): * if created with rhc-tooling * if created with JBT 2.) The import of git-shared project (that is not bound to an OpenShift app - no .openshift) is not cancelling yet if there's a .openshift folder. Thinking this through, I see that we need to know about the OpenShift-specific folders/configs that exist for the different app-types: * java/as7: .openshift, deployments * php: ... * ruby: ... -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.jboss.org/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira

[ https://issues.jboss.org/browse/JBIDE-10479?page=com.atlassian.jira.plugi... ] Andre Dietisheim edited comment on JBIDE-10479 at 1/20/12 4:59 PM: ------------------------------------------------------------------- 1.) still missing are the following 2 use cases: * Import project that is git-shared and is already bound to an OpenShift app (for as7/java apps: has .openshift): ** if created with rhc-tooling ** if created with JBT 2.) The import of git-shared project (that is not bound to an OpenShift app - no .openshift) is not cancelling yet if there's a .openshift folder. Thinking this through, I see that we need to know about the OpenShift-specific folders/configs that exist for the different app-types: * java/as7: .openshift, deployments * php: ... * ruby: ... We'd otherwise not be able to reliably detect if a project is already bound to OpenShift. was (Author: adietish): 1.) still missing are the following 2 use cases: * Import project that is git-shared and is already bound to an OpenShift app (for as7/java apps: has .openshift): ** if created with rhc-tooling ** if created with JBT 2.) The import of git-shared project (that is not bound to an OpenShift app - no .openshift) is not cancelling yet if there's a .openshift folder. Thinking this through, I see that we need to know about the OpenShift-specific folders/configs that exist for the different app-types: * java/as7: .openshift, deployments * php: ... * ruby: ... We'd otherwise not be able to reliably detect if a project is already bound to OpenShift. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.jboss.org/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira

[ https://issues.jboss.org/browse/JBIDE-10479?page=com.atlassian.jira.plugi... ] Andre Dietisheim updated JBIDE-10479: ------------------------------------- Release Notes Text: In M5 JBoss Tools was only able to publish Eclipse WTP projects that were not shared with any Team provider yet (svn, cvs, git, etc.). In Beta1 we now offer to publish Eclipse WTP projects that are already shared with git. The OpenShift tooling will merge existing .gitingore files, add the OpenShift remote repository etc. This now allows you to publish projects that you cloned from existing git repositories 8ex. github). Labels: new_and_noteworthy (was: ) Affects Version/s: 3.3.0.M5 -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.jboss.org/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira

[ https://issues.jboss.org/browse/JBIDE-10479?page=com.atlassian.jira.plugi... ] Andre Dietisheim commented on JBIDE-10479: ------------------------------------------ Yes, you currently can only choose a WTP project. The text in the dialog is a bit misleading, it talks of java projects. Shall we adapt the text in the project selection dialog to reflect this requirement? -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.jboss.org/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira

[ https://issues.jboss.org/browse/JBIDE-10479?page=com.atlassian.jira.plugi... ] Lucia Jelinkova commented on JBIDE-10479: ----------------------------------------- +1 for changing the description. BTW, is it an intention to name the default remote 'openshift' when enabling an Openshift application for existing Eclipse project even if it is not shared with different Git repository? -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.jboss.org/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira

[ https://issues.jboss.org/browse/JBIDE-10479?page=com.atlassian.jira.plugi... ] Max Rydahl Andersen updated JBIDE-10479: ---------------------------------------- Assignee: Andre Dietisheim (was: Max Rydahl Andersen) -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.jboss.org/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira

[ https://issues.jboss.org/browse/JBIDE-10479?page=com.atlassian.jira.plugi... ] Andre Dietisheim resolved JBIDE-10479. -------------------------------------- Resolution: Done -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.jboss.org/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira

[ https://issues.jboss.org/browse/JBIDE-10479?page=com.atlassian.jira.plugi... ] Lucia Jelinkova closed JBIDE-10479. ----------------------------------- The message is changed in Beta1d. Other issues filed to separate JIRAs. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.jboss.org/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira