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 4B0864196EE for ; Sat, 6 Feb 2010 15:59:55 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -1.333 X-Spam-Level: X-Spam-Status: No, score=-1.333 tagged_above=-999 required=5 tests=[AWL=1.266, BAYES_00=-2.599] autolearn=unavailable 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 Py86G-QG0Omu for ; Sat, 6 Feb 2010 15:59:54 -0800 (PST) Received: from clegg.madduck.net (clegg.madduck.net [193.242.105.96]) by olra.theworths.org (Postfix) with ESMTP id 3CF0E4196ED for ; Sat, 6 Feb 2010 15:59:54 -0800 (PST) Received: from lapse.rw.madduck.net (lapse.nz.madduck.net [IPv6:2001:4428:234::1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "lapse.rw.madduck.net", Issuer "CAcert Class 3 Root" (verified OK)) by clegg.madduck.net (postfix) with ESMTPS id 8EB701D4099; Sun, 7 Feb 2010 00:59:43 +0100 (CET) Received: by lapse.rw.madduck.net (Postfix, from userid 1000) id 35C44100; Sun, 7 Feb 2010 12:59:37 +1300 (NZDT) Date: Sun, 7 Feb 2010 12:59:37 +1300 From: martin f krafft To: David Bremner Message-ID: <20100206235937.GA31755@lapse.rw.madduck.net> Mail-Followup-To: David Bremner , Carl Worth , notmuch@notmuchmail.org References: <87zl60xjl7.wl%bremner@pivot.cs.unb.ca> <87my1z97un.wl%bremner@pivot.cs.unb.ca> <87ock3cf8j.fsf@yoom.home.cworth.org> <87iqaaue90.fsf@rocinante.cs.unb.ca> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-ripemd160; protocol="application/pgp-signature"; boundary="MGYHOYXEY6WxJCY8" Content-Disposition: inline In-Reply-To: <87iqaaue90.fsf@rocinante.cs.unb.ca> X-Motto: Keep the good times rollin' X-OS: Debian GNU/Linux squeeze/sid kernel 2.6.32-trunk-686 i686 X-Spamtrap: madduck.bogus@madduck.net X-Subliminal-Message: debian/rules! User-Agent: Mutt/1.5.20 (2009-06-14) X-Virus-Scanned: clamav-milter 0.95.3 at clegg X-Virus-Status: Clean Cc: notmuch@notmuchmail.org Subject: Re: [notmuch] hack to retag a directory 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: Sat, 06 Feb 2010 23:59:55 -0000 --MGYHOYXEY6WxJCY8 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable also sprach David Bremner [2010.02.07.1238 +1300]: > I have to say that merge conflicts are not very much fun. I tend > to do a certain amount of oh, take all the changes from the > server. I wonder if the approach that someone else mentioned of > keeping a file tags/message-id with the appropriate tags in it > might make merging less painful. Merge conflicts at the file level are even less fun. This reminds me of my plan to introduce .gitignore.d/*: http://kerneltrap.org/mailarchive/git/2007/10/1/326425 --=20 martin | http://madduck.net/ | http://two.sentenc.es/ =20 "there was silence for a moment, and then out of the scrambled mess of arthur's brain crawled some words." -- hitchhiker's guide to the galaxy =20 spamtraps: madduck.bogus@madduck.net --MGYHOYXEY6WxJCY8 Content-Type: application/pgp-signature; name="digital_signature_gpg.asc" Content-Description: Digital signature (see http://martin-krafft.net/gpg/) Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEAREDAAYFAktuAmkACgkQIgvIgzMMSnUyeACeKNGfa5fkxSdAy2PYa/Oqkwcq ZVQAn0tIgFkjHxwhDdqAV2ufvdSLQs5Y =Be+q -----END PGP SIGNATURE----- --MGYHOYXEY6WxJCY8--