1 Return-Path: <madduck@lapse.rw.madduck.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 4B0864196EE
\r
6 for <notmuch@notmuchmail.org>; Sat, 6 Feb 2010 15:59:55 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-1.333 tagged_above=-999 required=5 tests=[AWL=1.266,
\r
12 BAYES_00=-2.599] autolearn=unavailable
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id Py86G-QG0Omu for <notmuch@notmuchmail.org>;
\r
16 Sat, 6 Feb 2010 15:59:54 -0800 (PST)
\r
17 Received: from clegg.madduck.net (clegg.madduck.net [193.242.105.96])
\r
18 by olra.theworths.org (Postfix) with ESMTP id 3CF0E4196ED
\r
19 for <notmuch@notmuchmail.org>; Sat, 6 Feb 2010 15:59:54 -0800 (PST)
\r
20 Received: from lapse.rw.madduck.net (lapse.nz.madduck.net
\r
21 [IPv6:2001:4428:234::1])
\r
22 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
23 (Client CN "lapse.rw.madduck.net",
\r
24 Issuer "CAcert Class 3 Root" (verified OK))
\r
25 by clegg.madduck.net (postfix) with ESMTPS id 8EB701D4099;
\r
26 Sun, 7 Feb 2010 00:59:43 +0100 (CET)
\r
27 Received: by lapse.rw.madduck.net (Postfix, from userid 1000)
\r
28 id 35C44100; Sun, 7 Feb 2010 12:59:37 +1300 (NZDT)
\r
29 Date: Sun, 7 Feb 2010 12:59:37 +1300
\r
30 From: martin f krafft <madduck@madduck.net>
\r
31 To: David Bremner <david@tethera.net>
\r
32 Message-ID: <20100206235937.GA31755@lapse.rw.madduck.net>
\r
33 Mail-Followup-To: David Bremner <david@tethera.net>,
\r
34 Carl Worth <cworth@cworth.org>, notmuch@notmuchmail.org
\r
35 References: <87zl60xjl7.wl%bremner@pivot.cs.unb.ca>
\r
36 <87my1z97un.wl%bremner@pivot.cs.unb.ca>
\r
37 <87ock3cf8j.fsf@yoom.home.cworth.org>
\r
38 <87iqaaue90.fsf@rocinante.cs.unb.ca>
\r
40 Content-Type: multipart/signed; micalg=pgp-ripemd160;
\r
41 protocol="application/pgp-signature"; boundary="MGYHOYXEY6WxJCY8"
\r
42 Content-Disposition: inline
\r
43 In-Reply-To: <87iqaaue90.fsf@rocinante.cs.unb.ca>
\r
44 X-Motto: Keep the good times rollin'
\r
45 X-OS: Debian GNU/Linux squeeze/sid kernel 2.6.32-trunk-686 i686
\r
46 X-Spamtrap: madduck.bogus@madduck.net
\r
47 X-Subliminal-Message: debian/rules!
\r
48 User-Agent: Mutt/1.5.20 (2009-06-14)
\r
49 X-Virus-Scanned: clamav-milter 0.95.3 at clegg
\r
50 X-Virus-Status: Clean
\r
51 Cc: notmuch@notmuchmail.org
\r
52 Subject: Re: [notmuch] hack to retag a directory
\r
53 X-BeenThere: notmuch@notmuchmail.org
\r
54 X-Mailman-Version: 2.1.13
\r
56 List-Id: "Use and development of the notmuch mail system."
\r
57 <notmuch.notmuchmail.org>
\r
58 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
59 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
60 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
61 List-Post: <mailto:notmuch@notmuchmail.org>
\r
62 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
63 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
64 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
65 X-List-Received-Date: Sat, 06 Feb 2010 23:59:55 -0000
\r
69 Content-Type: text/plain; charset=us-ascii
\r
70 Content-Disposition: inline
\r
71 Content-Transfer-Encoding: quoted-printable
\r
73 also sprach David Bremner <david@tethera.net> [2010.02.07.1238 +1300]:
\r
74 > I have to say that merge conflicts are not very much fun. I tend
\r
75 > to do a certain amount of oh, take all the changes from the
\r
76 > server. I wonder if the approach that someone else mentioned of
\r
77 > keeping a file tags/message-id with the appropriate tags in it
\r
78 > might make merging less painful.
\r
80 Merge conflicts at the file level are even less fun. This reminds me
\r
81 of my plan to introduce .gitignore.d/*:
\r
83 http://kerneltrap.org/mailarchive/git/2007/10/1/326425
\r
86 martin | http://madduck.net/ | http://two.sentenc.es/
\r
88 "there was silence for a moment, and then out of the scrambled mess
\r
89 of arthur's brain crawled some words."
\r
90 -- hitchhiker's guide to the galaxy
\r
92 spamtraps: madduck.bogus@madduck.net
\r
95 Content-Type: application/pgp-signature; name="digital_signature_gpg.asc"
\r
96 Content-Description: Digital signature (see http://martin-krafft.net/gpg/)
\r
97 Content-Disposition: inline
\r
99 -----BEGIN PGP SIGNATURE-----
\r
100 Version: GnuPG v1.4.10 (GNU/Linux)
\r
102 iEYEAREDAAYFAktuAmkACgkQIgvIgzMMSnUyeACeKNGfa5fkxSdAy2PYa/Oqkwcq
\r
103 ZVQAn0tIgFkjHxwhDdqAV2ufvdSLQs5Y
\r
105 -----END PGP SIGNATURE-----
\r
107 --MGYHOYXEY6WxJCY8--
\r