[ https://issues.jboss.org/browse/JBIDE-12218?page=com.atlassian.jira.plugi... ] Andre Dietisheim updated JBIDE-12218: ------------------------------------- Fix Version/s: 3.3.2 (was: 3.3.1) postponed since there's no time left in 3.3.1 -- 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-12218?page=com.atlassian.jira.plugi... ] Andre Dietisheim commented on JBIDE-12218: ------------------------------------------ the current implementation now does push force in this case: !push-force.png! -- 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-12218?page=com.atlassian.jira.plugi... ] Andre Dietisheim edited comment on JBIDE-12218 at 8/1/12 11:36 AM: ------------------------------------------------------------------- the current implementation now does push force in this case (as implemented for JBIDE-12138): !push-force.png! was (Author: adietish): the current implementation now does push force in this case: !push-force.png! -- 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-12218?page=com.atlassian.jira.plugi... ] Andre Dietisheim updated JBIDE-12218: ------------------------------------- Attachment: deployed-helloworld.png -- 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-12218?page=com.atlassian.jira.plugi... ] Andre Dietisheim commented on JBIDE-12218: ------------------------------------------ There is a slight error though: The import does not recognized that the individual projects are shared within a git repo in the parent folder. The importer then creates a new git repo in the project-folder (you then end up having a new git-repo nested in the project folder). -- 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-12218?page=com.atlassian.jira.plugi... ] Andre Dietisheim commented on JBIDE-12218: ------------------------------------------ Afaik we cannot push the repo in the parent folder. That one has no pom in the root. It could be the correct approach though. But creating a new git-repo in the project folder is pretty much wrong IMHO. -- 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-12218?page=com.atlassian.jira.plugi... ] Andre Dietisheim edited comment on JBIDE-12218 at 8/22/12 9:19 AM: ------------------------------------------------------------------- Afaik we cannot push the repo in the parent folder. That one has no pom in the root. It could be the correct approach though. But creating a new git-repo in the project folder is pretty much wrong IMHO. @Max: WDYT? was (Author: adietish): Afaik we cannot push the repo in the parent folder. That one has no pom in the root. It could be the correct approach though. But creating a new git-repo in the project folder is pretty much wrong IMHO. -- 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-12218?page=com.atlassian.jira.plugi... ] Andre Dietisheim commented on JBIDE-12218: ------------------------------------------ According to http://stackoverflow.com/questions/1871282/nested-git-repositories there's nothing that would tell that nested git-repos are illegal. Apparently git submodules or subtree merging would be cleaner. Subtree merging is not supported in EGit yet though: http://stackoverflow.com/questions/1871282/nested-git-repositories -- 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-12218?page=com.atlassian.jira.plugi... ] Andre Dietisheim edited comment on JBIDE-12218 at 8/22/12 10:26 AM: -------------------------------------------------------------------- According to http://stackoverflow.com/questions/1871282/nested-git-repositories there's nothing that would disallow nested git-repos. I tested it and thing look good. When changing some files in the projects within the parent, the parent git repo get to know about the modifications. The nested git folder is automatically ignored (see also here: http://stackoverflow.com/questions/2317652/nested-git-repositories-withou...). Apparently git submodules or subtree merging would be cleaner (http://stackoverflow.com/questions/1871282/nested-git-repositories). I looked into Submodules and they dont look appropriate to me: You cannot define a submodule for a folder that is already within the index: {code} [adietish@adietish-thinkpad as-quickstarts]$ cd helloworld-html5/ [adietish@adietish-thinkpad helloworld-html5]$ git submodule add ssh://5217d3628cf043b08fcad0ed2d0aa6b6@test22-openshiftci.rhcloud.com/~/git/test22.git/ You need to run this command from the toplevel of the working tree. [adietish@adietish-thinkpad helloworld-html5]$ cd .. [adietish@adietish-thinkpad as-quickstarts]$ git submodule add ssh://5217d3628cf043b08fcad0ed2d0aa6b6@test22-openshiftci.rhcloud.com/~/git/test22.git/ helloworld-html5/ 'helloworld-html5' already exists in the index {code} Submodule look more like a way to aggregate existing repos into a ueber-repo. Here we have an existing repo with a folder that we'd like to get merged and pushed to an existing remote repo. Subtree merging would be imho the right tool for the merge. It does not resolve the issue when pushing though. We would still push the whole repo which has no pom and would not build nor run on OpenShift. Furthermore subtree merging is not supported in EGit yet: http://stackoverflow.com/questions/1871282/nested-git-repositories (see the jgit merge strategies here: http://download.eclipse.org/jgit/docs/jgit-2.0.0.201206130900-r/apidocs/o...). To me the current solution looks fine. I'd suggest we close this bug WORKS_FOR_ME was (Author: adietish): According to http://stackoverflow.com/questions/1871282/nested-git-repositories there's nothing that would tell that nested git-repos are illegal. I tested it and thing look good. When changing some files in the projects within the parent, the parent git repop get to know about the modifications. The nested git folder is automatically ignored (see also here: http://stackoverflow.com/questions/2317652/nested-git-repositories-withou...). Apparently git submodules or subtree merging would be cleaner (http://stackoverflow.com/questions/1871282/nested-git-repositories). Submodules does not look appropriate to me: You cannot define a submodule for a folder that is already within the index: {code} [adietish@adietish-thinkpad as-quickstarts]$ cd helloworld-html5/ [adietish@adietish-thinkpad helloworld-html5]$ git submodule add ssh://5217d3628cf043b08fcad0ed2d0aa6b6@test22-openshiftci.rhcloud.com/~/git/test22.git/ You need to run this command from the toplevel of the working tree. [adietish@adietish-thinkpad helloworld-html5]$ cd .. [adietish@adietish-thinkpad as-quickstarts]$ git submodule add ssh://5217d3628cf043b08fcad0ed2d0aa6b6@test22-openshiftci.rhcloud.com/~/git/test22.git/ helloworld-html5/ 'helloworld-html5' already exists in the index {code} Submodule look more like a way to aggregate existing repos into a parent repo. Here we have an existing repo with a folder that we'd like to get merged with an existing repo. Subtree merging would imho be the right tool for the merge. It does not resolve the issue when pushing. We would still push the whole repo which has no pom and would not build nor run on OpenShift. Furthermore subtree merging is not supported in EGit yet: http://stackoverflow.com/questions/1871282/nested-git-repositories (see the jgit merge strategies here: http://download.eclipse.org/jgit/docs/jgit-2.0.0.201206130900-r/apidocs/o...). To me the current solution looks fine. I'd suggest we close this bug WORKS_FOR_ME -- 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-12218?page=com.atlassian.jira.plugi... ] Andre Dietisheim edited comment on JBIDE-12218 at 8/22/12 12:16 PM: -------------------------------------------------------------------- We agreed that the only error here is that the git folder in the parent of the individual projects is not detected. The parent having a git folder should get detected even if the repo was not imported to Eclipse (the git team provider not being aware of it). I created a new issue for this: JBIDE-12459 Closing this issue as WORKS_AS_EXPECTED was (Author: adietish): We agreed that the only error here is that the git folder in the parent of the individual projects is not detected. The parent having a git folder should get detected even if the repo was not imported to Eclipse (the git team provider not being aware of it) -- 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-12218?page=com.atlassian.jira.plugi... ] Stefan Bunciak closed JBIDE-12218. ---------------------------------- Verified in JBoss Tools 4.0.0.Alpha1a -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira