[jbosstools-issues] [JBoss JIRA] (JBIDE-20396) commits missing in master branch

[Nick Boldt (JIRA)]

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

Nick Boldt commented on JBIDE-20396:
------------------------------------

Martin explains the logic here and why pushing to both branches was not (yet) done:

{quote}
(2015-07-28 12:18:39) nickboldt: surely some of those recent changes should be done in master too?
12:20
(2015-07-28 12:22:32) mmalina: nickboldt: to save work :)
(2015-07-28 12:23:05) mmalina: nickboldt: we started branching because you wanted it basically (because it was breaking some things)
(2015-07-28 12:23:33) nickboldt: sure but now master is out of date relative to Beta2x
(2015-07-28 12:23:49) mmalina: nickboldt: but we still don't really need two branches. or so we think. so we agreed to push only to Beta2x now and then take all the changes and push them to master once Beta2 is released
(2015-07-28 12:23:59) nickboldt: oic
(2015-07-28 12:24:26) mmalina: nickboldt: hopefully there won't be any conflicts :){quote}

> commits missing in master branch
> --------------------------------
>
>                 Key: JBIDE-20396
>                 URL: https://issues.jboss.org/browse/JBIDE-20396
>             Project: Tools (JBoss Tools)
>          Issue Type: Bug
>          Components: integration-platform
>    Affects Versions: 4.3.0.Beta2
>            Reporter: Nick Boldt
>
> I'm seeing some fixes done in Beta2x branch but not in master.
> For example...
> https://github.com/jbosstools/jbosstools-integration-tests/blob/98f87964ccf0526c1e243ce7e06f01d4a3c82de7/plugins/org.jboss.tools.cdi.reddeer/src/org/jboss/tools/cdi/reddeer/CDIConstants.java#L29 (Beta2x)
> but
> https://github.com/jbosstools/jbosstools-integration-tests/blob/master/plugins/org.jboss.tools.cdi.reddeer/src/org/jboss/tools/cdi/reddeer/CDIConstants.java#L29 (master)
> There are several commits that have ONLY gone to Beta2x branch. Compare these lists:
> https://github.com/jbosstools/jbosstools-integration-tests/commits/jbosstools-4.3.0.Beta2x (includes stuff on Jul 27, Jul 17)
> vs.
> https://github.com/jbosstools/jbosstools-integration-tests/commits/master
> Here are 4 commits that appear to have been missed from master:
> 1. https://github.com/jbosstools/jbosstools-integration-tests/commit/bd5ed074d38ba01ba8af635627cc7e4a57cc7ad6
> 2. https://github.com/jbosstools/jbosstools-integration-tests/commit/84a4159a7231d22fc992ad03138ed0af8dd1d5c7
> 3. https://github.com/jbosstools/jbosstools-integration-tests/commit/98f87964ccf0526c1e243ce7e06f01d4a3c82de7
> 4. https://github.com/jbosstools/jbosstools-integration-tests/commit/f30275e00f1f82aa17c2e20edc98e345f4658d31



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)