On Fri, Sep 23, 2011 at 1:26 AM, Christian Müller <christian.muel...@gmail.com> wrote: > See my notes inline > > Christian > Am 22.09.2011 13:43 schrieb "Christian Müller" <christian.muel...@gmail.com >>: >> >> Now it's a bit more clearer, but not totally. >> >> IMO, we only backported bugs and dependency changes which are bugfix > versions in the past. With Camel 2.8.2, we backported much more - mostly > all. I've expected a [DISCUSS] about this - not only a [HEADS UP]. I'm sure > Dan has good reasons for this, but it shoud be discussed first. >> >> We backported mostly all changes (which doesn't break users existing code) > into the 2.8 branch, but only a few changes into the 2.7 branch. Why? As > Hadrian mentioned in the board report, the 2.7 branch is still in > maintenance. >> >> When I'm back, I will add a WIKI page which describes our development > process/policy for backporting changes. > > Also how to do it with the mentioned Java/Python scripts, as we have it done > with our release step-by-step guide. I didn't know these scripts and nobody > told me about their existence. I was not able to find a WIKI page about it > (with my mobile phone ;-) ). I could imagine, I'm not the only one... >
Yeah now that I got the tooling on my laptop working I would like to add some notes in our wiki how to do this. Its going to be added somewhere here, as a sub page: http://camel.apache.org/developers.html There should also be a .exe of the svnmerge so its easy for windows users to run it. >> Thanks in advance for clarification, >> Christian >> >> Sent from a mobile device >> >> Am 22.09.2011 10:12 schrieb "Guillaume Nodet" <gno...@gmail.com>: >> >> > Fwiw, git-svn could be handy too ... as merges are really easy with git. >> > >> > On Thu, Sep 22, 2011 at 19:02, Daniel Kulp <dk...@apache.org> wrote: >> > >> >> On Thursday, September 22, 2011 6:44:42 PM Claus Ibsen wrote: >> >> > Hi >> >> > >> >> > I gave the DoMerges tool a try and it worked fine. >> >> > >> >> > However as my svnmerge.py python script causes some UTF-8 error after >> >> > the merge is done, the DoMerges tool breaks >> >> > after one merge. >> >> > >> >> > I tried downloading the latest svnerge.py file from the official >> >> > source but it fails as well. >> >> > I guess I need to find an older svnmerge.py file that dont fail at > the >> >> end. >> >> > >> >> > If anyone got a .py file working, then feel free to attach on a mail >> >> > and send to me, or this @dev. >> >> >> >> >> >> I've attached mine. What kind of error were you getting? Does it fail >> >> outside the tool as well? >> >> >> >> What is your LANG env variable set to? >> >> >> >> >> >> Dan >> >> >> >> >> >> >> >> >> >> >> >> > >> >> > On Thu, Sep 22, 2011 at 3:34 PM, Daniel Kulp <dk...@apache.org> > wrote: >> >> > > On Thursday, September 22, 2011 7:45:28 AM Claus Ibsen wrote: >> >> > >> On Wed, Sep 21, 2011 at 4:23 PM, Daniel Kulp <dk...@apache.org> >> >> wrote: >> >> > >> > I agree that I should have given a better "hey, ton of stuff > going >> >> > >> > to >> >> > >> > happen" heads up Monday morning (or Friday). >> >> > >> >> >> > >> Thanks. We are not accustomed to see 70-100 backports on the 2.x >> >> > >> branch overnight. >> >> > >> So we were wonder what happened. If some auto tool have been > enabled >> >> > >> or >> >> > >> whatnot? >> >> > > >> >> > > I really hate to point this out as it's a bit of an embarrassment > to >> >> me, >> >> > > but since you mentioned it....... >> >> > > >> >> > > If you look in: >> >> > > http://svn.apache.org/repos/asf/cxf/trunk/bin/ >> >> > > >> >> > > there is a DoMerges.java file in there that you can compile and run >> >> from >> >> > > a fixes branch checkout.. It pretty much walks you through the >> >> > > entire process of backporting fixes. It lists all the outstanding >> >> > > commits that haven't been reviewed, allows you to [M]erge commits >> >> > > individually, [B]lock commits (reviewed and shouldn't be merged > back), >> >> > > show the diffs, etc..... Glen added some good comment to the top of >> >> > > it a couple weeks ago. For the most part, it's quite easy to walk >> >> > > through a bunch of commits and merge things back with it. Takes > very >> >> > > little time. (one enhancement I plan to add is to have it print the >> >> > > URL to the viewvc for the commit and the full URL to the JIRA if > there >> >> > > is one mentioned. Little easier than the pure diffs.) In anycase, >> >> > > while not a complete "auto tool" that was used, it isn't hard to go >> >> > > through a lot of commits. >> >> > > >> >> > > Why is it embarrassing to me? Well, it's a silly little Java > program >> >> > > that is doing the job of something SHOULD have been written in > python >> >> > > or perl or even bash. I'll readily admit that. Best tool for the >> >> > > job was definitely not applied here. >> >> > > >> >> > > >> >> > > -- >> >> > > Daniel Kulp >> >> > > dk...@apache.org >> >> > > http://dankulp.com/blog >> >> > > Talend - http://www.talend.com >> >> -- >> >> Daniel Kulp >> >> dk...@apache.org >> >> http://dankulp.com/blog >> >> Talend - http://www.talend.com >> >> >> > >> > >> > >> > -- >> > ------------------------ >> > Guillaume Nodet >> > ------------------------ >> > Blog: http://gnodet.blogspot.com/ >> > ------------------------ >> > Open Source SOA >> > http://fusesource.com > -- Claus Ibsen ----------------- FuseSource Email: cib...@fusesource.com Web: http://fusesource.com Twitter: davsclaus, fusenews Blog: http://davsclaus.blogspot.com/ Author of Camel in Action: http://www.manning.com/ibsen/
