You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lucy.apache.org by Peter Karman <pe...@peknet.com> on 2012/01/02 17:48:21 UTC
[lucy-dev] Re: [lucy-commits] svn commit: r1226462 - in /incubator/lucy/trunk/perl:
lib/LucyX/Remote/SearchServer.pm t/510-remote_search.t t/550-cluster_searcher.t
nwellnhof@apache.org wrote on 1/2/12 10:31 AM:
> Author: nwellnhof
> Date: Mon Jan 2 16:31:13 2012
> New Revision: 1226462
>
> URL: http://svn.apache.org/viewvc?rev=1226462&view=rev
> Log:
> LUCY-205 Rework SearchServer API
>
could/should this be merged into the 0.3 branch as well?
--
Peter Karman . http://peknet.com/ . peter@peknet.com
Re: [lucy-dev] Re: [lucy-commits] svn commit: r1226462 - in /incubator/lucy/trunk/perl:
lib/LucyX/Remote/SearchServer.pm t/510-remote_search.t t/550-cluster_searcher.t
Posted by Peter Karman <pe...@peknet.com>.
On 1/8/12 9:26 AM, Nick Wellnhofer wrote:
> On 03/01/2012 04:32, Peter Karman wrote:
>> Marvin Humphrey wrote on 1/2/12 2:42 PM:
>>> (But Peter, if Nick doesn't get to this before you cut the
>>> first RC for 0.3.0, +1 for someone else to commit the backport.)
>>
>> I merged it.
>
> I just noticed that this commit did not get merged into the 0.3 branch:
>
> https://github.com/apache/lucy/commit/be92cbc44924c0232d681efe2a9da75b513227d8
>
>
> AFAIU it should be included in 0.3.
>
Thanks, Nick. Please merge it to the 0.3 branch.
--
Peter Karman . http://peknet.com/ . peter@peknet.com
Re: [lucy-dev] Re: [lucy-commits] svn commit: r1226462 - in /incubator/lucy/trunk/perl:
lib/LucyX/Remote/SearchServer.pm t/510-remote_search.t t/550-cluster_searcher.t
Posted by Nick Wellnhofer <we...@aevum.de>.
On 03/01/2012 04:32, Peter Karman wrote:
> Marvin Humphrey wrote on 1/2/12 2:42 PM:
>> (But Peter, if Nick doesn't get to this before you cut the
>> first RC for 0.3.0, +1 for someone else to commit the backport.)
>
> I merged it.
I just noticed that this commit did not get merged into the 0.3 branch:
https://github.com/apache/lucy/commit/be92cbc44924c0232d681efe2a9da75b513227d8
AFAIU it should be included in 0.3.
Nick
Re: [lucy-dev] Re: [lucy-commits] svn commit: r1226462 - in /incubator/lucy/trunk/perl:
lib/LucyX/Remote/SearchServer.pm t/510-remote_search.t t/550-cluster_searcher.t
Posted by Peter Karman <pe...@peknet.com>.
Marvin Humphrey wrote on 1/2/12 2:42 PM:
> (But Peter, if Nick doesn't get to this before you cut the
> first RC for 0.3.0, +1 for someone else to commit the backport.)
I merged it.
--
Peter Karman . http://peknet.com/ . peter@peknet.com
Re: [lucy-dev] [lucy-commits] svn commit: r1226462 - in
/incubator/lucy/trunk/perl: lib/LucyX/Remote/SearchServer.pm
t/510-remote_search.t t/550-cluster_searcher.t
Posted by Marvin Humphrey <ma...@rectangular.com>.
On Mon, Jan 02, 2012 at 03:55:25PM -0800, David E. Wheeler wrote:
> On Jan 2, 2012, at 12:42 PM, Marvin Humphrey wrote:
>
> > (FWIW, I tend to merge commits one at a time and copy/paste the commit message
> > so that the history of the branch is easy to grok.)
>
> Won’t SVN do that for you yet?
Maybe -- but I don't know how. My main goal in laying out those instructions
was to provide a recipe which is easy to follow for the short term and which
yields a sensible VCS history. I expect we'll be switching to Git a few
months from now, so I'm not planning to invest too much research time on
honing our Subversion-based processes for labor efficiency.
Marvin Humphrey
Re: [lucy-dev] [lucy-commits] svn commit: r1226462 - in
/incubator/lucy/trunk/perl: lib/LucyX/Remote/SearchServer.pm
t/510-remote_search.t t/550-cluster_searcher.t
Posted by "David E. Wheeler" <da...@justatheory.com>.
On Jan 2, 2012, at 12:42 PM, Marvin Humphrey wrote:
> (FWIW, I tend to merge commits one at a time and copy/paste the commit message
> so that the history of the branch is easy to grok.)
Won’t SVN do that for you yet?
David
Re: [lucy-dev] Re: [lucy-commits] svn commit: r1226462 - in
/incubator/lucy/trunk/perl: lib/LucyX/Remote/SearchServer.pm
t/510-remote_search.t t/550-cluster_searcher.t
Posted by Marvin Humphrey <ma...@rectangular.com>.
On Mon, Jan 02, 2012 at 06:02:49PM +0100, Nick Wellnhofer wrote:
>>> Log:
>>> LUCY-205 Rework SearchServer API
>>>
>>
>> could/should this be merged into the 0.3 branch as well?
>>
>
> Yes, this and the following commit (Remove SearchServer password) should
> be merged into 0.3.
Nick, could you do the honors? In general, we want the author of a patch to
handle backporting if they are willing, because they are intimately familiar
with how the patch works and won't need to come up to speed like fresh
committer would. (But Peter, if Nick doesn't get to this before you cut the
first RC for 0.3.0, +1 for someone else to commit the backport.)
In this case, the backport is trivial because trunk has not yet diverged from
0.3 for the files affected by this patch. Just use "svn merge -c" at the top
level of the branch checkout so that the svn:mergeinfo property gets attached
to the top dir rather than to individual files.
cd lucy-0.3.x
svn merge -c 1226462 https://svn.apache.org/repos/asf/incubator/lucy/trunk .
(FWIW, I tend to merge commits one at a time and copy/paste the commit message
so that the history of the branch is easy to grok.)
Marvin Humphrey
Re: [lucy-dev] Re: [lucy-commits] svn commit: r1226462 - in /incubator/lucy/trunk/perl:
lib/LucyX/Remote/SearchServer.pm t/510-remote_search.t t/550-cluster_searcher.t
Posted by Nick Wellnhofer <we...@aevum.de>.
On 02/01/2012 17:48, Peter Karman wrote:
> nwellnhof@apache.org wrote on 1/2/12 10:31 AM:
>> Author: nwellnhof
>> Date: Mon Jan 2 16:31:13 2012
>> New Revision: 1226462
>>
>> URL: http://svn.apache.org/viewvc?rev=1226462&view=rev
>> Log:
>> LUCY-205 Rework SearchServer API
>>
>
> could/should this be merged into the 0.3 branch as well?
>
Yes, this and the following commit (Remove SearchServer password) should
be merged into 0.3.
Nick