]
Rob Stryker commented on JBIDE-22209:
-------------------------------------
I've done a bunch of work on the script. There are still some false positives. Near
the bottom of the list there's a few commits where the "possible match" has
the same commit id (ha), so obviously has no diff between the two.
git patch-id will return two segments, and the 2nd segment is the commit id, so i've
cut that off and only use the first segment from now on.
Finally, there are a few situations where git patch-id is returning different values for
identical patches, and I can't figure out exactly why. It's possible the commit
had some whitespace changes durign a rebase or merge, and that's what causes it?
Anyway, since we now locate potentially matching id's, AND we link to their diffs, it
is much easier for reviewer to verify.
For JBIDE 4.4.0.Alpha1: Find Missing Commits From jbosstools-4.3.x
for master [OpenShift]
-----------------------------------------------------------------------------------------
Key: JBIDE-22209
URL:
https://issues.jboss.org/browse/JBIDE-22209
Project: Tools (JBoss Tools)
Issue Type: Sub-task
Components: openshift
Reporter: Rob Stryker
Assignee: Fred Bricon
Priority: Blocker
Labels: task
Fix For: 4.4.0.Alpha1
For JBIDE 4.4.0.Alpha1 [OpenShift]: Ensure all commits pushed to jbosstools-4.3.x have
either been made in master, or are intentionally excluded from master.
Below are listed all commits made to jbosstools-4.3.x that have not been found in master.
It is possible these commits do exist in master, but the patches are not identical. It is
also possible that the commits made in jbosstools-4.3.x are not relevant to master 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 master
3) If it should be in master, please find out why it is not in master. You may need to
browse master's commit log to find a commit that should match.
4) If you cannot find a matching commit, and it *should* be committed to master,
please cherry-pick that commit to master 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 master, whether you have successfully merged
it in now, or whether it is not intended to be committed to master or is inappropriate for
master.
6) When all complete, please close (do not resolve) this issue.
Folder: jbosstools-openshift at
https://github.com/jbosstools/jbosstools-openshift/
Searching for commits present in jbosstools-4.3.x and missing from master
Commit hash "8e29d0" is the last common ancestor of jbosstools-4.3.x and
master
8e29d0 is 409 commits ago in branch master
8e29d0 is 394 commits ago in branch jbosstools-4.3.x
Commits missing from master that are in jbosstools-4.3.x:
-
https://github.com/jbosstools/jbosstools-openshift//commit/9f74be7e9e62b7...
false positive
(
https://github.com/jbosstools/jbosstools-openshift/commit/e95668e54ab2520...)
-
https://github.com/jbosstools/jbosstools-openshift//commit/e0f8e68a563905...
false positive
(
https://github.com/jbosstools/jbosstools-openshift/commit/fec63f7c28f8935...
-
https://github.com/jbosstools/jbosstools-openshift//commit/009dcba545a46a...
version change
-
https://github.com/jbosstools/jbosstools-openshift//commit/fcdfc9a8da1d94...
minor difference with master
* missing:
[
fcdfc9a8da1d9481bb7f9734577641c924ef8f4c|https://github.com/jbosstools/jb...]
** possible match:
[
9825476239f56ce6ee2ea55fd5a6aa5232bc51a8|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/SJee
* missing:
[
087f63953adebe164bf22ce2a66dd9a0499693e6|https://github.com/jbosstools/jb...]
* missing:
[
55c161d3adf09e0c7b33a58644f1c5ca99504b81|https://github.com/jbosstools/jb...]
** possible match:
[
4ba598d82ad91fa54f85305ddf06376d10d48a03|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/BWjY
* missing:
[
2b7e853f34533c91434edda9eac652c566104f10|https://github.com/jbosstools/jb...]
** possible match:
[
9bf691fd453d3cd2511aee6313fcbf99d5e1cc88|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/DjWI
* missing:
[
36cb020dbdb0f6cbd5156a77b914066fc6cebe52|https://github.com/jbosstools/jb...]
** possible match:
[
d4fbe303d108d9046cc860a1182df83dc947549c|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/ijNM
* missing:
[
7a2589b5e1f43f7e933303bf3d73eeb0b0fd9800|https://github.com/jbosstools/jb...]
** possible match:
[
8d7fb92a2ce87aeb3cfb99c7a89ac283a70f5655|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/IViO
* missing:
[
e77a887a382e2c2fbaa7e75bcddf9f0da14129f6|https://github.com/jbosstools/jb...]
** possible match:
[
2ac4de160c7e6e90eaddbca064025e209a3f7e37|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/jUDJ
* missing:
[
eb65cd687d0002f6e36d0280ca702cda4d9fcfb0|https://github.com/jbosstools/jb...]
** possible match:
[
2dd870e4ed7381a83618d290a87b0326aabcd168|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/NFCC
* missing:
[
39492ed213757911a558b8b5e58cad3e4ce0ba40|https://github.com/jbosstools/jb...]
* missing:
[
59482980213957c6dbe2450107f834753738bd85|https://github.com/jbosstools/jb...]
** possible match:
[
185a007ea89c67b413abd8134eb1c4bc4e171f12|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/FPHb
* missing:
[
6873d3b22fc7342addc0ab1a7d9ea4cffde3cea5|https://github.com/jbosstools/jb...]
** possible match:
[
e64620033ca230008a6c69a291343caf8625d107|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/ajjW
* missing:
[
5c09968cfb3e07bbc4ca2b5baa152c5c133c7ac7|https://github.com/jbosstools/jb...]
* missing:
[
4f729326a186d01dc2192b752cbccc7cd5e663ca|https://github.com/jbosstools/jb...]
* missing:
[
5ea17672ab0c1881da7534346e1b0babc3aac812|https://github.com/jbosstools/jb...]
** possible match:
[
e6086f928e2710e2a1339ead363ae49c564a549f|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/faQX
* missing:
[
11f974238058d689bf6e30bfc8ec35ae3421b406|https://github.com/jbosstools/jb...]
** possible match:
[
75b84bd7fc04e64412797daf9f992fd92ecc47ab|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/OdIf
* missing:
[
116a42ee84e118ddd1c22f1b149b36c45abd1c87|https://github.com/jbosstools/jb...]
** possible match:
[
1fbd783e928eed3741e10265da5dac3fbfa5d8bb|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/UCPd
* missing:
[
45c165ff6336459faf2d0d87bd5adf7ee0334e1e|https://github.com/jbosstools/jb...]
** possible match:
[
b4a1d0f795255f758d47240b67c8cafcbd8978df|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/WIXR
* missing:
[
8f33efc052ae081e2a62a8d544c713abbbdf629f|https://github.com/jbosstools/jb...]
** possible match:
[
e6bca96b82accdf07793e3e42d714d9f2891d014|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/QFNH
* missing:
[
760a1f971fc17d022af9d916d3929a8c18eb6c1b|https://github.com/jbosstools/jb...]
** possible match:
[
4dce844d9be15ac58d0c67349c98f3fbb0926425|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/RVFa
* missing:
[
7dffff362b99f470929e5f70d0e4a4ee68ef5184|https://github.com/jbosstools/jb...]
** possible match:
[
6423ad3b6396362c97b44547a22c5c3d57af7e14|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/aTjV
* missing:
[
dd8a104dd92dc9e411d0e77cebf9ea6ea132aa42|https://github.com/jbosstools/jb...]
** possible match:
[
cd4d85b11ed3fbf3b8380cbb4a81f0ffca30c6f9|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/jjGU
* missing:
[
e7dde4151339ab12d92198131db3f0b0bbec33ce|https://github.com/jbosstools/jb...]
** possible match:
[
f5d5533948ae31e527eb774268fe7fd8e5044f26|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/VTRg
* missing:
[
26a1d1e7d918014a1f69d451baddebbbbaa3f749|https://github.com/jbosstools/jb...]
** possible match:
[
7b2b75c8482b596bc0d745951ee49f169de53a98|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/PQjO
* missing:
[
5968aa42fac7edaaedbbbc680362a93993a1922f|https://github.com/jbosstools/jb...]
* missing:
[
95dac28be51c0eb8ab14a47447ad8ab7a239cad7|https://github.com/jbosstools/jb...]
** possible match:
[
740300f67d65f26a1d0d5f4776c25208b043bed8|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/OSRH
* missing:
[
e4ecf6ff5ea331f634c8674b5d11ef186d52550b|https://github.com/jbosstools/jb...]
** possible match:
[
37c0882f3dd49de8100d3bfcd11999ca2ee4f8c0|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/dHZI
* missing:
[
6c0cb8049b291e6df5d8863f48c3c2b6d3bc651e|https://github.com/jbosstools/jb...]
* missing:
[
a3d95ba46eb98c47890a43917b55e946540c44bf|https://github.com/jbosstools/jb...]
** possible match:
[
29bdf8867d4f8e3623a50ecd7b80d0ef7b775ae6|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/baCd
* missing:
[
d6a2d2effd2a737e7b9e001b3acd5503d66e1886|https://github.com/jbosstools/jb...]
** possible match:
[
666b0687de65d602e41d1e4d9c55115ce1f139bf|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/EUcD
* missing:
[
8620c1caeeed7407dc55d4ecb3d7367c14e269ff|https://github.com/jbosstools/jb...]
** possible match:
[
e52fc1575420659bfd311a59802e08322c2cf468|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/WOSI
* missing:
[
9b6e8d60ff1bf6b02eebf7fc28612baecb819965|https://github.com/jbosstools/jb...]
** possible match:
[
69c3435d8d201ba868a7a3190dfc21165fb763ba|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/CRfb
* missing:
[
f539d2ef0bee63a1b99e4759fa6a01c8344fd206|https://github.com/jbosstools/jb...]
** possible match:
[
2707303445c0aee5d0b6bdd5f8eb96d75b4e2994|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/jCHI
* missing:
[
201a855cc5cac72870f15195d206e854f593b9de|https://github.com/jbosstools/jb...]
* missing:
[
14b05efeef623a07ccc5975f315f74b7c4f02f2b|https://github.com/jbosstools/jb...]
* missing:
[
8c5a7ead1fa835c9c602c2e69944426641ca9b4e|https://github.com/jbosstools/jb...]
** possible match:
[
b1cd4bc24af111eefe92faec033d5c0be3395ebc|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/CjOU
* missing:
[
213f368d88d21514b84e677037e97e3746d6fc61|https://github.com/jbosstools/jb...]
* missing:
[
61a9b842a5c34a9ecc0f3aca15d476e0bffad4e7|https://github.com/jbosstools/jb...]
* missing:
[
4206c33ba53c6f1aecb1ff8350a977c48db83d8f|https://github.com/jbosstools/jb...]
* missing:
[
bd9c728c6c3a75e0fb580ee4a31e37f8202b4f58|https://github.com/jbosstools/jb...]
* missing:
[
f51830888169e71144b09ac31714d45afa80e218|https://github.com/jbosstools/jb...]
* missing:
[
951590f4f5cf8d004b36e30d460d985be50ed42e|https://github.com/jbosstools/jb...]
* missing:
[
17da52cb6d96518986e64da97b340b6bf0f71ea9|https://github.com/jbosstools/jb...]
** possible match:
[
17da52cb6d96518986e64da97b340b6bf0f71ea9|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/YHOH
* missing:
[
2578624c74b744d935e2030573b7c97ddd69f6d0|https://github.com/jbosstools/jb...]
** possible match:
[
2578624c74b744d935e2030573b7c97ddd69f6d0|https://github.com/jbosstools/jb...].
*** Inspect the difference between the two patches:
http://sprunge.us/PeVA
[Search for all task
JIRA|https://issues.jboss.org//issues/?jql=%28%28project+in+%28JBDS%29+an...],
or [Search for OpenShift task
JIRA|https://issues.jboss.org//issues/?jql=%28%28project+in+%28JBDS%29+an...]