1 Return-Path: <david@tethera.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 712CE431FBC
\r
6 for <notmuch@notmuchmail.org>; Tue, 5 Aug 2014 18:24:23 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\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 W6-I7HXUez5h for <notmuch@notmuchmail.org>;
\r
16 Tue, 5 Aug 2014 18:24:18 -0700 (PDT)
\r
17 Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
\r
18 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id BA858431FAE
\r
21 for <notmuch@notmuchmail.org>; Tue, 5 Aug 2014 18:24:18 -0700 (PDT)
\r
22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
\r
23 (envelope-from <david@tethera.net>)
\r
24 id 1XEpxg-0005vI-1I; Tue, 05 Aug 2014 22:24:16 -0300
\r
25 Received: (nullmailer pid 7648 invoked by uid 1000); Wed, 06 Aug 2014
\r
27 From: David Bremner <bremner@debian.org>
\r
28 To: "W. Trevor King" <wking@tremily.us>, notmuch@notmuchmail.org
\r
29 Subject: Re: [PATCH v3] nmbug: Translate to Python
\r
30 In-Reply-To: <878un36bd5.fsf@maritornes.cs.unb.ca>
\r
32 <84447a0ed48412e1587761d560d18cb5affd4f66.1405897133.git.wking@tremily.us>
\r
33 <878un36bd5.fsf@maritornes.cs.unb.ca>
\r
34 User-Agent: Notmuch/0.18.1+62~g0c12920 (http://notmuchmail.org) Emacs/24.3.1
\r
35 (x86_64-pc-linux-gnu)
\r
36 Date: Tue, 05 Aug 2014 22:24:10 -0300
\r
37 Message-ID: <871tsue7gl.fsf@maritornes.cs.unb.ca>
\r
39 Content-Type: text/plain
\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: Wed, 06 Aug 2014 01:24:23 -0000
\r
54 David Bremner <bremner@debian.org> writes:
\r
57 > I did notice that merging was noticably noisier than I remembered.
\r
60 Hmm. I just noticed hit another problem with merge. I have a local
\r
61 commit that deletes a couple tags; when I attempt to merge I get
\r
62 complaints about local changes to files.
\r
64 error: Your local changes to the following files would be overwritten by merge:
\r
65 tags/1406859003-11561-2-git-send-email-amdragon@mit.edu/needs-review
\r
66 tags/1406859003-11561-3-git-send-email-amdragon@mit.edu/needs-review
\r
67 Please, commit your changes or stash them before you can merge.
\r
69 Traceback (most recent call last):
\r
70 File "/home/bremner/config/scripts/nmbug", line 766, in <module>
\r
72 File "/home/bremner/config/scripts/nmbug", line 437, in merge
\r
74 File "/home/bremner/config/scripts/nmbug", line 210, in _git
\r
75 return _spawn(args=args, **kwargs)
\r
76 File "/home/bremner/config/scripts/nmbug", line 193, in _spawn
\r
77 args=args, status=status, stdout=stdout, stderr=stderr)
\r
78 __main__.SubprocessError: ['git', '--git-dir', '/home/bremner/.nmbug',
\r
79 'merge', '@{upstream}'] exited with 128
\r
81 Calling the perl version of nmbug successfully creates a little
\r