Today is my ticket sweep day, and one of the issues I came across is updating Subversion plugin to support SVNKit 1.8.x.
To make this happen, we need to merge upstream 1.8.x release to our patch branch. This is normally fairly routine, but in this case it turns out there was a bit of complication. Our last merge was with 1.7.10, which was after SVNKit branched off 1.8.x. So if I just merge in 1.8.4, we get all sorts of merge conflicts for backporting that they have done between their 1.7.x and 1.8.x branches. To make my life easier, I forked off our master branch where it merged 1.7.4, into master-1.8.x. 1.7.4 is before SVNKit branched off their 1.8.x effort, so I was then able to cleanly merge 1.8.4 into master-1.8.x. I've then cherry-picked our patches since 1.7.4, of which there are only two. I've reviewed diff between jenkins-1.8.x and 1.8.4-approx (tag that approximates their 1.8.4 release), and our difference looks OK. I'm running Subversion plugin tests now and so far they are running well. I think we should rename our current master branch to jenkins-1.7.x, and then rename jenkins-1.8.x into the master. Any thoughts? [1] https://issues.jenkins-ci.org/browse/JENKINS-18935 -- Kohsuke Kawaguchi -- You received this message because you are subscribed to the Google Groups "Jenkins Developers" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
