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
