[jbosstools-issues] [JBoss JIRA] (JBIDE-13175) Openshift server adapter: on first push it says that it has no local changes. Even though local clone has 1 commit more than remote

Andre Dietisheim (JIRA) jira-events at lists.jboss.org
Mon Jan 21 05:56:21 EST 2013


    [ https://issues.jboss.org/browse/JBIDE-13175?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12749147#comment-12749147 ] 

Andre Dietisheim commented on JBIDE-13175:
------------------------------------------

BranchTrackingStatus is tracking the remote that is configured for the given branch. If we clone from OpenShift, then master is configured to have the OpenShift as remote. So BranchTrackingStatus will work and give the correct "ahead" state. On the other hand, if we clone from github and merge the OpenShift git repo with it, the master would have github configured as defaut remote:

{code}
[branch "master"]
	remote = origin
	merge = refs/heads/master
{code}

BranchTrackingStatus.of() would then return the state of the current branch compared to github (its origin).
                
> Openshift server adapter: on first push it says that it has no local changes. Even though local clone has 1 commit more than remote
> -----------------------------------------------------------------------------------------------------------------------------------
>
>                 Key: JBIDE-13175
>                 URL: https://issues.jboss.org/browse/JBIDE-13175
>             Project: Tools (JBoss Tools)
>          Issue Type: Feature Request
>          Components: openshift
>    Affects Versions: 4.0.0.Beta2
>            Reporter: Andre Dietisheim
>            Assignee: Andre Dietisheim
>             Fix For: 4.1.0.Alpha1
>
>         Attachments: 1-local-change.png, no-local-changes.png, no_changes_yes.png
>
>
> # EXEC: launch *OpenShift Application* wizard and create a new application / import existing one
> # ASSERT: you get the OpenShift application imported to your workspace
> # EXEC: in *Servers* view, select the adapter for your OpenShift application and pick *Publish* from its context menu
> Result:
> The adapter tells you that there are no local changes. If you look at your local project you'll see in the git-decoration that the local git repo is ahead of 1 commit of the remote, so there is a local commit that could be pushed/published.
> !no-local-changes.png!
> Expected result:
> The adapter should tell you that there are local changes and ask you if you want to publish them.

--
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


More information about the jbosstools-issues mailing list