Mailing-List: contact dev-help@camel.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@camel.apache.org
Received-SPF: pass (nike.apache.org: domain of claus.ibsen@gmail.com
 designates 209.85.215.173 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <1337457.Bn8TatSgDS@dilbert.dankulp.com>
References: 
 <CAGB5yNnCLzpJe7VPCOs0KbNnyhCTokXun8yGkKQCj_7pXYjG0g@mail.gmail.com>
 <3115981.7OquQo7IQn@dilbert.dankulp.com>
 <CAGB5yN=xyRr82UhQjedmKngsHU1CdPVXoFzkBqmRNPu7A=qCcQ@mail.gmail.com>
 <1337457.Bn8TatSgDS@dilbert.dankulp.com>
From: Claus Ibsen <claus.ibsen@gmail.com>
Date: Thu, 22 Sep 2011 18:44:42 +0200
Message-ID: 
 <CAGB5yN=4W9m5Y8zzy1o_a7k_RaGv10kMuQq78mz8jxJhnte84g@mail.gmail.com>
Subject: Re: Camel 2.8.2 - Reason for the many backports?
To: dev@camel.apache.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

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.


On Thu, Sep 22, 2011 at 3:34 PM, Daniel Kulp <dkulp@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 <dkulp@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.. =A0 =A0It pretty much walks you through the entir=
e process
> of backporting fixes. =A0 It lists all the outstanding commits that haven=
't been
> reviewed, allows you to [M]erge commits individually, =A0[B]lock commits
> (reviewed and shouldn't be merged back), show the diffs, etc..... =A0 Gle=
n added
> some good comment to the top of it a couple weeks ago. =A0 =A0For the mos=
t part,
> it's quite easy to walk through a bunch of commits and merge things back =
with
> it. =A0 Takes very little time. =A0 (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 i=
f
> there is one mentioned. =A0 Little easier than the pure diffs.) =A0 =A0 I=
n anycase,
> while not a complete "auto tool" that was used, it isn't hard to go throu=
gh a
> lot of commits.
>
> Why is it embarrassing to me? =A0 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. =A0 =A0I'll readily admit that. =A0Best tool for the job was defini=
tely not
> applied here.
>
>
> --
> Daniel Kulp
> dkulp@apache.org
> http://dankulp.com/blog
> Talend - http://www.talend.com
>


--=20
Claus Ibsen
-----------------
FuseSource
Email: cibsen@fusesource.com
Web: http://fusesource.com
Twitter: davsclaus, fusenews
Blog: http://davsclaus.blogspot.com/
Author of Camel in Action: http://www.manning.com/ibsen/