[
https://issues.jboss.org/browse/JBIDE-17740?page=com.atlassian.jira.plugi...
]
Andre Dietisheim edited comment on JBIDE-17740 at 7/8/14 9:51 AM:
------------------------------------------------------------------
I stumbled upon another stunning behavior where the merged project needs a push force to
get deployed to OpenShift:
!push-force.png!
This is caused by our import procedure: it clones the remote repo, copies the openshift
specific files into the local clone (.openshift, deployments, pom.xml) and committs them
(in Beta2):
!git-log.png!
This is not a proper merge and we thus have to push force the result to the remote. So
this is again no proper error but an indication that we should move to a proper merge
since jgit now supports the recursive merge startegy: JBIDE-14890
was (Author: adietish):
I stumbled upon another stunning behavior where the merged project needs a push force to
get deployed to OpenShift:
!push-force.png!
This is caused by our import procedure: it clones the remote repo, copies the openshift
specific files into the local clone and committs them (in Beta2):
!git-log.png!
This is not a proper merge and we thus have to push force the result to the remote. So
this is again no proper error but an indication that we should move to a proper merge
since jgit now supports the recursive merge startegy: JBIDE-14890
Cannot deploy git-based project to OpenShift
--------------------------------------------
Key: JBIDE-17740
URL:
https://issues.jboss.org/browse/JBIDE-17740
Project: Tools (JBoss Tools)
Issue Type: Bug
Components: openshift
Affects Versions: 4.2.0.Beta3
Reporter: Marián Labuda
Assignee: Andre Dietisheim
Priority: Blocker
Labels: respin-a
Fix For: 4.2.0.Beta3
Attachments: cannot-create-server-adapter.png, git-log.png,
import-failed-uncommitted-changes.png, import.png, push-force.png
It is not possible to deploy existing git based project to the OpenShift instance.
What's going to happen is that new OpenShift project is created, but existing git
project is not merged. As result there is a project based on basic cartridge and not on
existing project. There is a issue with git changes - uncommitted changes required to
commit first, but it is not possible bcs. remote is still set to the old one git remote.
See log
{code}
!ENTRY org.jboss.tools.openshift.express.ui 4 0 2014-07-02 08:52:28.848
!MESSAGE Could not import project to the workspace.
!STACK 0
org.jboss.tools.openshift.express.internal.ui.UnCommittedChangesException: The project
jboss-javaee6-webapp has uncommitted changes. Please commit those changes first.
at
org.jboss.tools.openshift.express.internal.ui.wizard.application.importoperation.MergeIntoGitSharedProject.execute(MergeIntoGitSharedProject.java:97)
at
org.jboss.tools.openshift.express.internal.ui.wizard.application.OpenShiftApplicationWizardModel.mergeIntoGitSharedProject(OpenShiftApplicationWizardModel.java:186)
at
org.jboss.tools.openshift.express.internal.ui.wizard.application.OpenShiftApplicationWizard$ImportJob.runInWorkspace(OpenShiftApplicationWizard.java:376)
at
org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
{code}
Error shell:
!import.png!
--
This message was sent by Atlassian JIRA
(v6.2.6#6264)