Return-Path: <david@tethera.net>
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 712CE431FBC
	for <notmuch@notmuchmail.org>; Tue,  5 Aug 2014 18:24:23 -0700 (PDT)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: 0
X-Spam-Level: 
X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
	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 W6-I7HXUez5h for <notmuch@notmuchmail.org>;
	Tue,  5 Aug 2014 18:24:18 -0700 (PDT)
Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
	(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id BA858431FAE
	for <notmuch@notmuchmail.org>; Tue,  5 Aug 2014 18:24:18 -0700 (PDT)
Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
	(envelope-from <david@tethera.net>)
	id 1XEpxg-0005vI-1I; Tue, 05 Aug 2014 22:24:16 -0300
Received: (nullmailer pid 7648 invoked by uid 1000); Wed, 06 Aug 2014
	01:24:10 -0000
From: David Bremner <bremner@debian.org>
To: "W. Trevor King" <wking@tremily.us>, notmuch@notmuchmail.org
Subject: Re: [PATCH v3] nmbug: Translate to Python
In-Reply-To: <878un36bd5.fsf@maritornes.cs.unb.ca>
References:
 <84447a0ed48412e1587761d560d18cb5affd4f66.1405897133.git.wking@tremily.us>
	<878un36bd5.fsf@maritornes.cs.unb.ca>
User-Agent: Notmuch/0.18.1+62~g0c12920 (http://notmuchmail.org) Emacs/24.3.1
	(x86_64-pc-linux-gnu)
Date: Tue, 05 Aug 2014 22:24:10 -0300
Message-ID: <871tsue7gl.fsf@maritornes.cs.unb.ca>
MIME-Version: 1.0
Content-Type: text/plain
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Aug 2014 01:24:23 -0000

David Bremner <bremner@debian.org> writes:


> I did notice that merging was noticably noisier than I remembered. 
>

Hmm. I just noticed hit another problem with merge. I have a local
commit that deletes a couple tags; when I attempt to merge I get
complaints about local changes to files. 

error: Your local changes to the following files would be overwritten by merge:
	tags/1406859003-11561-2-git-send-email-amdragon@mit.edu/needs-review
	tags/1406859003-11561-3-git-send-email-amdragon@mit.edu/needs-review
Please, commit your changes or stash them before you can merge.
Aborting
Traceback (most recent call last):
  File "/home/bremner/config/scripts/nmbug", line 766, in <module>
    args.func(**kwargs)
  File "/home/bremner/config/scripts/nmbug", line 437, in merge
    wait=True)
  File "/home/bremner/config/scripts/nmbug", line 210, in _git
    return _spawn(args=args, **kwargs)
  File "/home/bremner/config/scripts/nmbug", line 193, in _spawn
    args=args, status=status, stdout=stdout, stderr=stderr)
__main__.SubprocessError: ['git', '--git-dir', '/home/bremner/.nmbug',
	'merge', '@{upstream}'] exited with 128

Calling the perl version of nmbug successfully creates a little 
diamond merge