Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
MIME-Version: 1.0
In-Reply-To: 
 <CAAL6JQjzk0G52Yvt1QFzg6W0Zfn4+NAmN-Hi4-gntcYsvrZuug@mail.gmail.com>
References: 
 <CAPaJBx4Ur3Om2L9SspeDfLRgvyj6=NZUdQGZMtHpH+4sXDPQyQ@mail.gmail.com>
	<CABvT1DFpLG+=QkAAdwiWX0-S3nhpKujUaqXxq7eVOfCr6igUvw@mail.gmail.com>
	<CAL+Y1nt=X7BnT+9SZ=kxDcnc0SGHVKP4mhjmzEPx_874v-KGHg@mail.gmail.com>
	<CAJNb-9pWQ7KM=rGuczAbqXZS0O38HaQRwvVjMH4YP21hip8x3Q@mail.gmail.com>
	<CAL+Y1ntyxbgrT_E61hYJKZOnJ4NjFUu6tooJiYFxt+DJ2KL=tA@mail.gmail.com>
	<CAPaJBx7JOemNS9+LMp4GiS+RBunw+LVaXFJ7gLaq94Bs9HZ8kA@mail.gmail.com>
	<CAAL6JQjzk0G52Yvt1QFzg6W0Zfn4+NAmN-Hi4-gntcYsvrZuug@mail.gmail.com>
Date: Fri, 17 May 2013 20:55:22 +0100
Message-ID: 
 <CAPaJBx6X6rqfyjM5MxX1N78prvj=+Hz+TSL+o5vp2LEwexAGvA@mail.gmail.com>
Subject: Re: [REQUEST] Merge changes for CouchDB 1.3.1
From: Noah Slater <nslater@apache.org>
To: "dev@couchdb.apache.org" <dev@couchdb.apache.org>
Content-Type: multipart/alternative; boundary=089e011839a6fbd85004dcef5c22

--089e011839a6fbd85004dcef5c22
Content-Type: text/plain; charset=ISO-8859-1

Not sure, Randal. Dave was asking similar things on IRC today.

We need to drive that to conclusion. (Unfortunately, I'm not your man for
that. Git is not my wheelhouse.)


On 17 May 2013 19:59, Randall Leeds <randall.leeds@gmail.com> wrote:

> Where are we with merge procedure? What's the workflow we want to see
> for master -> 1.3.1?
>
> 1.3.1 is cut from 1.3.x I assume. But you asked a lot of questions
> about how to make it easier to see the differences.
>
> The best I could come up with to satisfy your question would have been
> to insist that *every single commit* on master be a merge commit and
> that those same merged heads could be merged to 1.3.x. That would, I
> think, make a log like "--first-parent 1.3.x..master" show only the
> ones that haven't been backported (I think).
>
> I already applied at least one fix via cherry-picking. I'll put it in
> CHANGES.
>
> On Fri, May 17, 2013 at 4:51 AM, Noah Slater <nslater@apache.org> wrote:
> > Friendly bump.
> >
> > NEWS and CHANGES are still empty.
> >
> > I'll be calling the vote on 1.3.1 in 12 days, so y'all better get your
> > changes in pronto! ;)
> >
> >
> > On 15 May 2013 07:24, Dave Cottlehuber <dch@jsonified.com> wrote:
> >
> >> On 15 May 2013 06:17, Benoit Chesneau <bchesneau@gmail.com> wrote:
> >> > On May 15, 2013 12:06 AM, "Dave Cottlehuber" <dch@jsonified.com>
> wrote:
> >> >>
> >> >> On 14 May 2013 23:24, Robert Newson <rnewson@apache.org> wrote:
> >> >> >
> >> >> > I'd like to see the mochiweb work for R16 compatibility in 1.3.1.
> >> >> >
> >> >> > B.
> >> >>
> >> >
> >> > this can't happen since it removes the r13 compatibility. imo it has
> to
> >> > wait for 1.4.
> >> >
> >> > in the mean rime ws could port the patch from macport to give the
> >> > compatibility with r16... This parse_transform works well.
> >> >
> >> > - benoit
> >>
> >> Seems sensible.
> >>
> >
> >
> >
> > --
> > NS
>


-- 
NS

--089e011839a6fbd85004dcef5c22--