1 Return-Path: <bremner@pivot.cs.unb.ca>
\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 C3E3A4196ED
\r
6 for <notmuch@notmuchmail.org>; Sat, 6 Feb 2010 15:40:50 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.001 tagged_above=-999 required=5
\r
12 tests=[BAYES_50=0.001] 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 1XNYatZAPw+K for <notmuch@notmuchmail.org>;
\r
16 Sat, 6 Feb 2010 15:40:49 -0800 (PST)
\r
17 Received: from pivot.cs.unb.ca (pivot.cs.unb.ca [131.202.240.57])
\r
18 by olra.theworths.org (Postfix) with ESMTP id ED1954196EE
\r
19 for <notmuch@notmuchmail.org>; Sat, 6 Feb 2010 15:40:48 -0800 (PST)
\r
20 Received: from bas6-hamilton14-1176216207.dsl.bell.ca ([70.27.162.143]
\r
21 helo=rocinante.cs.unb.ca)
\r
22 by pivot.cs.unb.ca with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32)
\r
23 (Exim 4.69) (envelope-from <bremner@pivot.cs.unb.ca>)
\r
24 id 1NduGd-0000xR-FI; Sat, 06 Feb 2010 19:40:47 -0400
\r
25 Received: from bremner by rocinante.cs.unb.ca with local (Exim 4.71)
\r
26 (envelope-from <bremner@rocinante.cs.unb.ca>)
\r
27 id 1NduDz-0004ji-HU; Sat, 06 Feb 2010 19:38:03 -0400
\r
28 From: David Bremner <david@tethera.net>
\r
29 To: Carl Worth <cworth@cworth.org>, notmuch@notmuchmail.org
\r
30 In-Reply-To: <87ock3cf8j.fsf@yoom.home.cworth.org>
\r
31 References: <87zl60xjl7.wl%bremner@pivot.cs.unb.ca>
\r
32 <87my1z97un.wl%bremner@pivot.cs.unb.ca>
\r
33 <87ock3cf8j.fsf@yoom.home.cworth.org>
\r
34 Date: Sat, 06 Feb 2010 19:38:03 -0400
\r
35 Message-ID: <87iqaaue90.fsf@rocinante.cs.unb.ca>
\r
37 Content-Type: text/plain; charset=us-ascii
\r
38 X-Sender-Verified: bremner@pivot.cs.unb.ca
\r
39 Subject: Re: [notmuch] hack to retag a directory
\r
40 X-BeenThere: notmuch@notmuchmail.org
\r
41 X-Mailman-Version: 2.1.13
\r
43 List-Id: "Use and development of the notmuch mail system."
\r
44 <notmuch.notmuchmail.org>
\r
45 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
47 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
48 List-Post: <mailto:notmuch@notmuchmail.org>
\r
49 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
50 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
51 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
52 X-List-Received-Date: Sat, 06 Feb 2010 23:40:51 -0000
\r
54 On Fri, 05 Feb 2010 17:41:48 -0800, Carl Worth <cworth@cworth.org> wrote:
\r
56 [talking about gitmuch, a simple wrapper around notmuch dump && git commit]
\r
58 > And it's interesting that this script might be just good enough for the
\r
59 > synchronization needs of some people. It's not integrated, and might
\r
60 > require manual fixup of any resulting git conflicts, but it might be
\r
64 I have to say that merge conflicts are not very much fun. I tend to do a
\r
65 certain amount of oh, take all the changes from the server. I wonder if
\r
66 the approach that someone else mentioned of keeping a file
\r
67 tags/message-id with the appropriate tags in it might make merging less
\r
70 > The biggest problem I see is that if I were to read some messages
\r
71 > locally, and then run "gitmuch restore" then this would wipe out the
\r
72 > local changes I had made. So we'll definitely want a more integrated
\r
73 > solution to eliminate the chance of problems like this.
\r
75 Yeah, the footgun potential is definitely there.
\r
77 > One easy answer is to just make "notmuch restore" do nothing for
\r
78 > messages where the existing tags are the same as the tags mentioned in
\r
79 > the input file. I just pushed a change to implement this, (along with
\r
80 > new tests for "notmuch dump" and "notmuch restore" of course).
\r
82 Heh, I think I later posted a patch to do that as well.
\r