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 8517A431FBC for ; Tue, 5 Aug 2014 18:16:26 -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 of7W5aJr1eP9 for ; Tue, 5 Aug 2014 18:16:21 -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 AC526431FAE for ; Tue, 5 Aug 2014 18:16:21 -0700 (PDT) Received: from remotemail by yantan.tethera.net with local (Exim 4.80) (envelope-from ) id 1XEppx-0005t1-DI; Tue, 05 Aug 2014 22:16:17 -0300 Received: (nullmailer pid 6543 invoked by uid 1000); Wed, 06 Aug 2014 01:16:10 -0000 From: David Bremner To: "W. Trevor King" , 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:16:10 -0300 Message-ID: <874mxqe7tx.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." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Aug 2014 01:16:26 -0000 David Bremner writes: > > I did notice that merging was noticably noisier than I remembered. > rejected pushes also seem noisier than before; I'm not sure the python backtrace adds anything here. To nmbug@nmbug.tethera.net:nmbug-tags ! [rejected] master -> master (fetch first) error: failed to push some refs to 'nmbug@nmbug.tethera.net:nmbug-tags' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate the remote changes hint: (e.g., 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. Traceback (most recent call last): File "/home/bremner/config/scripts/nmbug", line 766, in args.func(**kwargs) File "/home/bremner/config/scripts/nmbug", line 463, in push _git(args=args, 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', 'push'] exited with 1