Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 5B0EC429E20 for ; Thu, 10 Mar 2011 18:21:41 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.99 X-Spam-Level: X-Spam-Status: No, score=-0.99 tagged_above=-999 required=5 tests=[ALL_TRUSTED=-1, T_MIME_NO_TEXT=0.01] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UMqFo46RIzuf; Thu, 10 Mar 2011 18:21:39 -0800 (PST) Received: from yoom.home.cworth.org (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 5CCBD431FB5; Thu, 10 Mar 2011 18:21:39 -0800 (PST) Received: by yoom.home.cworth.org (Postfix, from userid 1000) id F183154C0C4; Thu, 10 Mar 2011 18:21:38 -0800 (PST) From: Carl Worth To: Austin Clements , Michal Sojka Subject: Re: Xapian locking errors with custom query parser In-Reply-To: References: <87d3nhe3g9.fsf@steelpick.2x.cz> User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.2.1 (i486-pc-linux-gnu) Date: Thu, 10 Mar 2011 18:21:38 -0800 Message-ID: <87lj0m8ki5.fsf@yoom.home.cworth.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Cc: notmuch@notmuchmail.org X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Mar 2011 02:21:41 -0000 --=-=-= Content-Transfer-Encoding: quoted-printable On Fri, 28 Jan 2011 21:26:03 -0500, Austin Clements wrot= e: > unlocked. Here's the fix. cworth, what's the most convenient way for > me to slip this in to the patch series? I'd most prefer a rebased branch including the fix, along with an email sent to me, (giving either the branch-name to pull or else the actual patches via email). [I think I answered this in IRC a while ago, but I don't see a later email from you on this topic. Do you have a branch that's ready for me? Perhaps that's qparser-3 (which looks more likely than qparser or qparser-hack)] Maybe we could use a naming convention for branches that people feel are ready for me to pull. For example, if I look at Austin's current git branches I see: amdragon/0.3.x amdragon/atomic-new-hack amdragon/atomic-new-v1 amdragon/eager-metadata amdragon/eager-metadata-2 amdragon/eager-metadata-v3 amdragon/folder-hack amdragon/getdate amdragon/inheritable-tags-hack amdragon/master amdragon/qparser amdragon/qparser-3 amdragon/qparser-hack amdragon/search-perf amdragon/search-perf-2 amdragon/search-perf-3 amdragon/search-perf-hack Some of those are obviously old (search-perf and search-perf-2 obviously superceded by search-perf-3). And some are obviously just experiements (qparser-hack, search-perf-hack, folder-hack, and qparser-hack). But the others are less clear. One option is for me to not go looking for any branches except in response to specific pull requests. Another option would be for people to name branches something like for-cworth/qparser-3 once things are ready to go. That way, I could do something like: git remote update git branch -r | grep for-cworth and see what people are proposing. What do you think? Of course, I still want to have email so that everyone can follow along at home, and it's easy to reply for patch review, etc. =2DCarl =2D-=20 carl.d.worth@intel.com --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iD8DBQFNeYcy6JDdNq8qSWgRAqiHAJ4oXSeNWt9F4qDDQ8SnhIP2LxYTrQCeNlzm DX3ybbWhJLreFXNL3GosCHc= =ozPV -----END PGP SIGNATURE----- --=-=-=--