Failure to merge: winp sometimes kills random processes when using killRecursive #22
Assignees
Comments
|
awesome! |
|
any news on this? |
|
Any updates/workarounds? |
|
Unfortunately, no. Have not found time to handle the issue on this summer and then forgotten about it. My apologies. |
|
I'll try to remerge it later today |
|
Cool, thanks for the update! |
|
this is still valid, please do something |
oleg-nenashev
added a commit
to oleg-nenashev/jenkins
that referenced
this issue
Nov 6, 2016
…-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) ### Changes to be picked ### 1.24 Release date: Nov 2, 2016 * [Issue #22](jenkinsci/winp#22) - Winp sometimes kills random processes when using killRecursive. ([PR #23](jenkinsci/winp#23)) * [WINP-10](https://java.net/jira/browse/WINP-10) - Fix for `getCmdLineAndEnvVars()` which fails on x64 versions of Windows. ([PR #20](jenkinsci/winp#20)) * [Issue #24](jenkinsci/winp#24) - Wrong folder when using the `winp.folder.preferred` system property (parent instead of the actual folder). ([PR #25](jenkinsci/winp#25)) * [Issue #26](jenkinsci/winp#26), [JENKINS-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) - Native class now tries loading DLLs via the temp location. ([PR #27](jenkinsci/winp#27)) ### 1.23 Release date: Fev 16, 2015 * Migrate native components to Visual Studio Community 2013. ([PR #14](jenkinsci/winp#14)) * Provide a `winp.unpack.dll.to.parent.dir` property, which disables DLL unpacking to the parent dir. ([PR #14](jenkinsci/winp#12))
oleg-nenashev
added a commit
to jenkinsci/jenkins
that referenced
this issue
Nov 27, 2016
…-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) (#2619) ### Changes to be picked ### 1.24 Release date: Nov 2, 2016 * [Issue #22](jenkinsci/winp#22) - Winp sometimes kills random processes when using killRecursive. ([PR #23](jenkinsci/winp#23)) * [WINP-10](https://java.net/jira/browse/WINP-10) - Fix for `getCmdLineAndEnvVars()` which fails on x64 versions of Windows. ([PR #20](jenkinsci/winp#20)) * [Issue #24](jenkinsci/winp#24) - Wrong folder when using the `winp.folder.preferred` system property (parent instead of the actual folder). ([PR #25](jenkinsci/winp#25)) * [Issue #26](jenkinsci/winp#26), [JENKINS-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) - Native class now tries loading DLLs via the temp location. ([PR #27](jenkinsci/winp#27)) ### 1.23 Release date: Fev 16, 2015 * Migrate native components to Visual Studio Community 2013. ([PR #14](jenkinsci/winp#14)) * Provide a `winp.unpack.dll.to.parent.dir` property, which disables DLL unpacking to the parent dir. ([PR #14](jenkinsci/winp#12))
olivergondza
pushed a commit
to jenkinsci/jenkins
that referenced
this issue
Dec 6, 2016
…-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) (#2619) ### Changes to be picked ### 1.24 Release date: Nov 2, 2016 * [Issue #22](jenkinsci/winp#22) - Winp sometimes kills random processes when using killRecursive. ([PR #23](jenkinsci/winp#23)) * [WINP-10](https://java.net/jira/browse/WINP-10) - Fix for `getCmdLineAndEnvVars()` which fails on x64 versions of Windows. ([PR #20](jenkinsci/winp#20)) * [Issue #24](jenkinsci/winp#24) - Wrong folder when using the `winp.folder.preferred` system property (parent instead of the actual folder). ([PR #25](jenkinsci/winp#25)) * [Issue #26](jenkinsci/winp#26), [JENKINS-20913](https://issues.jenkins-ci.org/browse/JENKINS-20913) - Native class now tries loading DLLs via the temp location. ([PR #27](jenkinsci/winp#27)) ### 1.23 Release date: Fev 16, 2015 * Migrate native components to Visual Studio Community 2013. ([PR #14](jenkinsci/winp#14)) * Provide a `winp.unpack.dll.to.parent.dir` property, which disables DLL unpacking to the parent dir. ([PR #14](jenkinsci/winp#12)) (cherry picked from commit 63c2f6c)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
The following issue describes a problem still present in winp due to a failure to merge the pull request correctly: winp sometimes kills random processes when using killRecursive
Specifically this pull request was not correctly merged: #8
A simple check would seem to indicate the commit was merged:
However the merge (b859526) actually reverted the change during the merge. Note that
native/winp.cppis listed as a conflict. It would appear a merge strategy "ours" was used to resolve the conflict, hence discarding the change.We encountered this problem only recently because we have been using the
1.17-atlassian1release of winp (found here https://github.com/bturner/winp/tree/winp-1.17-atlassian1), which does include a fix for the issue, for a long time. We recently upgraded to the 1.19 release from the primary winp repository and have been seeing this problem since.The text was updated successfully, but these errors were encountered: