couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Filipe David Manana <fdman...@apache.org>
Subject Re: Commits to 1.1.x not in 1.0.x
Date Wed, 15 Jun 2011 09:01:39 GMT
Paul, why do you need to backport that patch? It's related to a change
that ended up only in 1.1.x and trunk (use of mochiweb's
Request:accepts_content_type/1).

On Wed, Jun 15, 2011 at 2:04 AM, Paul Davis <paul.joseph.davis@gmail.com> wrote:
> On Tue, Jun 14, 2011 at 8:55 AM, Jan Lehnardt <jan@apache.org> wrote:
>> Good find Paul,
>>
>> On 14 Jun 2011, at 01:22, Paul Davis wrote:
>>
>>> I was just going through what we back ported to 1.1.x to make sure
>>> that all the relevant commits are also on 1.0.x before rolling a
>>> release. There are a few that are mostly trivial but I've come across
>>> two that I'm a bit stumped on.
>>>
>>> The first is this one:
>>>
>>> * https://github.com/davisp/couchdb/commit/a0563ab7ce204cf82feb56259d7a52c0b84077b7
>>>
>>>  Large contiguous conflict in share/www/script/test/design_docs.js that I'm
>>>  not sure if I can just choose this patched version or not.
>>>
>>> The patch to util.js applies cleanly, but the diff to design_docs.js
>>> results in a fairly large conflict. It may be a simple code move with
>>> indentation difference but if someone could eyeball that closer that'd
>>> help.
>>
>> It seems that these two are conflicting:
>>
>> commit 118b8906ba8199471265398f11296d756d62d992
>> Author: Filipe David Borba Manana <fdmanana@apache.org>
>> Date:   Mon Nov 15 20:53:32 2010 +0000
>>
>>    Refactoring of the design_docs.js test: fixed indentation and improved readability.
>>
>>
>>    git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1035447 13f79535-47bb-0310-9956-ffa450edef68
>>
>> commit b49ac86e9ac820ff327d132e418f0df5e0f772c8
>> Author: Filipe David Borba Manana <fdmanana@apache.org>
>> Date:   Sat Oct 30 11:28:32 2010 +0000
>>
>>    Trivial change: add/move semi-collons to where they belong to.
>>
>>
>>    git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1029030 13f79535-47bb-0310-9956-ffa450edef68
>>
>> Cheers
>> Jan
>> --
>>
>>
>>> The second is:
>>>
>>> * https://github.com/davisp/couchdb/commit/d952ac01cb4cd4ae5ceb0c8cc079acf595ff9747
>>>
>>>  Appears to rely on mochiweb_request:accepts_content_type which does not
>>>  appear to exist in 1.0.x
>>>
>>> I'm not even sure if this is relevant to the 1.0.x branch or was a fix
>>> for something introduced in the 1.1.x branch with the various
>>> content-type changes and what not. Again, if someone would eyeball
>>> this that is more familiar with the interaction with jquery/futon
>>> that'd be a help.
>>
>>
>>
>>
>>
>
> So I managed to get the circular imports thing applied which was the
> first patch. My SVN rage only flared two or three times even.
>
> Unless someone can show me a way to backport this patch:
>
> * https://github.com/davisp/couchdb/commit/d952ac01cb4cd4ae5ceb0c8cc079acf595ff9747
>
>  Appears to rely on mochiweb_request:accepts_content_type which does not
>  appear to exist in 1.0.x
>
> I'm going to ignore it and proceed rolling 1.0.3.
>



-- 
Filipe David Manana,
fdmanana@gmail.com, fdmanana@apache.org

"Reasonable men adapt themselves to the world.
 Unreasonable men adapt the world to themselves.
 That's why all progress depends on unreasonable men."

Mime
View raw message