[jbosstools-issues] [JBoss JIRA] (JBIDE-24397) For JBIDE 4.4.4.Final: Find Missing Commits From master for jbosstools-4.4.x [build-sites]

Tue May 9 16:41:00 EDT 2017

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

Nick Boldt commented on JBIDE-24397:
------------------------------------

Maintenance was prolly done in 2 commits but in master I squashed and merged them.

So your tool is getting confused because the "possible match" doesn't work when it's 1 commit matching a combined pair of commits in the other branch.

When you look for a matching commit across the branches, could you look not at the single commits but at the diff between N and N-1, then also N-2? 

Or a concrete example:

* https://github.com/jbosstools/jbosstools-build-sites/commits/jbosstools-4.4.x
** https://github.com/jbosstools/jbosstools-build-sites/commit/f545b2bae44c94dfa4c6b10a576b9682454e464e
** https://github.com/jbosstools/jbosstools-build-sites/commit/fefbbbf29ca0c7132b8400bd1145fcebcdabec7f

vs.

* https://github.com/jbosstools/jbosstools-build-sites/commits/master
** https://github.com/jbosstools/jbosstools-build-sites/commit/a1fd4ed0f5a95bee818aa41e3d25d161f8613507

Or compare these:

https://github.com/jbosstools/jbosstools-build-sites/compare/a18246ec97cc2d4c142373c670fbc0ccc229e9be...f545b2bae44c94dfa4c6b10a576b9682454e464e
vs.
https://github.com/jbosstools/jbosstools-build-sites/commit/a1fd4ed0f5a95bee818aa41e3d25d161f8613507

> For JBIDE 4.4.4.Final: Find Missing Commits From master for jbosstools-4.4.x [build-sites]
> ------------------------------------------------------------------------------------------
>
>                 Key: JBIDE-24397
>                 URL: https://issues.jboss.org/browse/JBIDE-24397
>             Project: Tools (JBoss Tools)
>          Issue Type: Sub-task
>          Components: updatesite
>            Reporter: Jeff MAURY
>            Assignee: Nick Boldt
>            Priority: Blocker
>              Labels: task
>             Fix For: 4.4.4.Final
>
>
> For JBIDE 4.4.4.Final [build-sites]: Ensure all commits pushed to master have either been made in jbosstools-4.4.x, or are intentionally excluded from jbosstools-4.4.x. 
> Below are listed all commits made to master that have not been found in jbosstools-4.4.x. It is possible these commits do exist in jbosstools-4.4.x, but the patches are not identical. It is also possible that the commits made in master are not relevant to jbosstools-4.4.x or should not be applied. 
> If there are no commits listed below, please close (do not resolve) this issue. 
> Otherwise:
>    1) Click on each link below. 
>    2) Evaluate whether the given commit *should* be in jbosstools-4.4.x
>    3) If it should be in jbosstools-4.4.x, please find out why it is not in jbosstools-4.4.x. You may need to browse jbosstools-4.4.x's commit log to find a commit that should match. 
>    4) If you cannot find a matching commit, and it *should* be committed to jbosstools-4.4.x, please cherry-pick that commit to jbosstools-4.4.x or otherwise merge it in. 
>    5) In comments, please indicate any suspicious commits (ie, commits not related to simple version changes), whether it exists in jbosstools-4.4.x, whether you have successfully merged it in now, or whether it is not intended to be committed to jbosstools-4.4.x or is inappropriate for jbosstools-4.4.x.
>    6) When all complete, please close (do not resolve) this issue.
>    
> Folder: jbosstools-build-sites at https://github.com/jbosstools/jbosstools-build-sites
> Searching for commits present in master and missing from jbosstools-4.4.x
>  Commit hash  "8a0ffd" is the last common ancestor of master and jbosstools-4.4.x
>  8a0ffd is 7 commits ago in branch jbosstools-4.4.x
>  8a0ffd is 6 commits ago in branch master
>    Commits missing from jbosstools-4.4.x that are in master:
> * missing: JBIDE-24240-EBZ-511793-add-org.eclipse.wst.common.modulecore-patch-feature-to-JBT-Abridged-category-CoreTools-and-WebTools-too https://github.com/jbosstools/jbosstools-build-sites/commit/a1fd4ed0f5a95bee818aa41e3d25d161f8613507
> ** possible match: https://github.com/jbosstools/jbosstools-build-sites/commit/fefbbbf29ca0c7132b8400bd1145fcebcdabec7f
> *** Inspect the difference between the two patches:  http://sprunge.us/iaPA
> * missing: bump-master-to-4.5.0 https://github.com/jbosstools/jbosstools-build-sites/commit/d1fd2abdaf3e082c80357c3f55268565e53b591e
> * missing: JBIDE-23960-comment-bump-up-to-parent-pom-version-4.5.0.AM1-SNAPSHOT-close https://github.com/jbosstools/jbosstools-build-sites/commit/d859d58008d12d7d0a419f58c80db4b4b00a7821
> [Search for all task JIRA|https://issues.jboss.org//issues/?jql=%28%28project+in+%28JBDS%29+and+fixVersion+%3D+%2210.4.0.GA%22%29+or+%28project+in+%28JBIDE%29+and+fixVersion+%3D+%224.4.4.Final%22%29%29+AND+labels+%3D+task], or [Search for build-sites task JIRA|https://issues.jboss.org//issues/?jql=%28%28project+in+%28JBDS%29+and+fixVersion+%3D+%2210.4.0.GA%22%29+or+%28project+in+%28JBIDE%29+and+fixVersion+%3D+%224.4.4.Final%22%29%29+AND+labels+%3D+task+and+component+in+%28%22updatesite%22%29]

--
This message was sent by Atlassian JIRA
(v7.2.3#72005)