Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Received-SPF: pass (nike.apache.org: domain of paul.joseph.davis@gmail.com
 designates 209.85.212.52 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:from:date:message-id:subject:to:content-type;
        b=Nz2XNXgFcaSMOGJdBRvEf5S73sMQIuTHuxtnRF3AjqIXZhA4jd42BHB3fwgej7F/c3
         yGKdBxrnG3CNA2gUKNM03A32uc3whSf32XGAnHYYeAIcyzcFQsG5MWsNpr0IJaUgjNOV
         CwM8ukSqv+ONgZfGSjK0si2G4Wwc/mHw11s9Y=
MIME-Version: 1.0
From: Paul Davis <paul.joseph.davis@gmail.com>
Date: Mon, 13 Jun 2011 19:22:41 -0400
Message-ID: <BANLkTin=rDygukbCknTma5te2yLUS6G2xA@mail.gmail.com>
Subject: Commits to 1.1.x not in 1.0.x
To: dev@couchdb.apache.org
Content-Type: text/plain; charset=ISO-8859-1

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.

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.

Thanks