From dev-return-24290-apmail-couchdb-dev-archive=couchdb.apache.org@couchdb.apache.org Sat Dec 1 22:33:30 2012 Return-Path: X-Original-To: apmail-couchdb-dev-archive@www.apache.org Delivered-To: apmail-couchdb-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0615AD19A for ; Sat, 1 Dec 2012 22:33:30 +0000 (UTC) Received: (qmail 38329 invoked by uid 500); 1 Dec 2012 22:33:29 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 38295 invoked by uid 500); 1 Dec 2012 22:33:29 -0000 Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list dev@couchdb.apache.org Received: (qmail 38284 invoked by uid 99); 1 Dec 2012 22:33:29 -0000 Received: from minotaur.apache.org (HELO minotaur.apache.org) (140.211.11.9) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2012 22:33:29 +0000 Received: from localhost (HELO mail-pb0-f52.google.com) (127.0.0.1) (smtp-auth username nslater, mechanism plain) by minotaur.apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Dec 2012 22:33:29 +0000 Received: by mail-pb0-f52.google.com with SMTP id ro2so1110383pbb.11 for ; Sat, 01 Dec 2012 14:33:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-originating-ip:in-reply-to:references:date :message-id:subject:from:to:content-type:x-gm-message-state; bh=8Y/GUqTomB2Hl1Li3Z6vvHdOftlU2v3ERXe9xS9JCME=; b=aQBukg+uVuFlTDqnD9lsN/5+nUTkWJVXh3pUFxNKtUZZHwF4aLXgG8rXMVgTs7TzHb cc7jMzRKhlCdiA70jgsZLmmeh6cb3YnXy3TpUl3+CQ0F2YwVkm/gIPa2bCaPHBt6untv OuFpbMF6lQVaIwOGdYVWHKTqx2qJ+PxFhPaePK6fhg5EwHclM5atBr0j0DjT5ZBl7Yfy bhRA01gP5FOuMDgIe6C6Df3OWWV/s+l/JrJxAwKOeW0KNlDDGXZdtWeflMHazBzOHh9i GEDsnxbIhiM2SMAgIVOymxw7hXd9o3nnKyZ/AeWTDGTznND1ZEAoG9TCUqlJCYW/c+T8 4OiA== MIME-Version: 1.0 Received: by 10.66.75.162 with SMTP id d2mr14250661paw.27.1354401208878; Sat, 01 Dec 2012 14:33:28 -0800 (PST) Received: by 10.66.246.138 with HTTP; Sat, 1 Dec 2012 14:33:28 -0800 (PST) X-Originating-IP: [178.250.115.206] In-Reply-To: References: Date: Sat, 1 Dec 2012 22:33:28 +0000 Message-ID: Subject: Re: docs branch From: Noah Slater To: dev@couchdb.apache.org Content-Type: multipart/alternative; boundary=f46d042dfd71f0452104cfd21a9a X-Gm-Message-State: ALoCoQmAIZKFcW51XLpPzs6dP61u9doCZziOZn/e7cg/2Ve7aRrGYVxWp+h46g7dC1Wz94dwZljk --f46d042dfd71f0452104cfd21a9a Content-Type: text/plain; charset=ISO-8859-1 Okay. On 1 December 2012 20:21, Dave Cottlehuber wrote: > On 1 December 2012 16:01, Noah Slater wrote: > > Why is this only coming up now? We've been talking about this for weeks. > > Mainly because this week is the first time I've seriously worked > through squashing and cleaning it up as prep for merging it. > > > I also complete disagree with the idea that we need more testing. I have > a > > few more tiny things that I want to do, but once I am happy, then I think > > we're ready to merge. And I think this can happen today. > > > > What is the actual problem here? Are you running into problems getting > the > > branch merged into master? I presume we are trying to merge it into > master > > in one changset, and then merge that into 1.3.x. > > Per IRC discussion we will do this as cherrypicks into 1.3.x and master > equally. > > > There is no need to split the changes into logical chunks, IMO. > > Bringing a single large change in one go makes it very hard to work > back to a single commit if you're hunting for a regression that isn't > covered in a test suite. > > If we can separate out the autotools upgrade part from the rest, I'd > feel much more comfortable. Let's have a crack at that tonight. > > A+ > Dave > -- NS --f46d042dfd71f0452104cfd21a9a--