General question about patches

View: New views
3 Messages — Rating Filter:   Alert me  

General question about patches

by Ken Krugler :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Hi Jukka,

I'm running into issues with patch collision, where there are  
overlapping changes to the same source file that address different  
Jira issues.

Unfortunately I need to use my working/modified copy of tika-trunk to  
build versions needed for Bixo, so I can't start with a clean trunk  
for each patch, unless I want to invest even more time.

But this means that soon patches will include other patches, which  
seems bad.

Thoughts on this?

-- Ken

--------------------------
Ken Krugler
TransPac Software, Inc.
<http://www.transpac.com>
+1 530-210-6378


Re: General question about patches

by Jukka Zitting :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Hi,

On Wed, Sep 30, 2009 at 3:14 PM, Ken Krugler
<kkrugler_lists@...> wrote:

> I'm running into issues with patch collision, where there are overlapping
> changes to the same source file that address different Jira issues.
>
> Unfortunately I need to use my working/modified copy of tika-trunk to build
> versions needed for Bixo, so I can't start with a clean trunk for each
> patch, unless I want to invest even more time.
>
> But this means that soon patches will include other patches, which seems
> bad.
>
> Thoughts on this?

If you keep up this level of contributions, we'll grant you commit
access in no time. :-)

Until that I or some other Tika committer will try to get your patches
reviewed and committed at a faster pace to avoid such complexities.

PS. Another alternative, if you're familiar with Git, is for you to
work on a clone of the git://git.apache.org/tika.git mirror. This way
you can keep committing incrementally to your local copy while your
patches are still waiting to be applied.

BR,

Jukka Zitting

Re: General question about patches

by Ken Krugler :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Hi Jukka,

> PS. Another alternative, if you're familiar with Git, is for you to
> work on a clone of the git://git.apache.org/tika.git mirror. This way
> you can keep committing incrementally to your local copy while your
> patches are still waiting to be applied.

I use Git for Bixo (http://github.com/emi/bixo) and a few other  
projects, so that could be interesting.

Thanks,

-- Ken