Community
Participate
Working Groups
When I reviewed code togethere with Boris today , I had to pick up a specific commit using something like git cherry-pick 05371af065df56947b963d444cbd821f1569bb55 It will be nice if we can have this in Orion.
Another case here we should consider as well: I had that branch in the remote now. I planned to cherry pick it up later this week after we decide the code in that branch has to be pushed to master. But today I fixed another bug which will conflict . So cherry-pick should cover this as well.
https://github.com/pjanik/orion.client/tree/bug349727 I wrote all this code and have the rights to contribute it to Eclipse under the eclipse.org web site terms of use.
cherry pick on the remote view does not work. I get: ReferenceError: gitService is not defined gitService.getLog(jsonDa...n(scopedCommitsJsonData, secondArd) { when I fix the wrong reference, I get: HTTP status code: 200 gitClient.js (line 788) ReferenceError: remoteNavigator is not defined remoteNavigator.rendere...comingCommits(scopedCommitsJsonData); Moreover we always get OK status after cherry pick, even if the chosen commit was already cherry-picked. We might handle it by checking if HEAD was moved during the operation.
The fix did not work well for the remote view what was quite important. I fixed that and I'm raising a new bug for "chosen commit was already cherry-picked" issue (bug 353572). http://git.eclipse.org/c/orion/org.eclipse.orion.client.git/commit/?id=5954e4f7efe6dc1dde13758dc5a1d8987dd59918
