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 CF07E429E32 for ; Thu, 12 Jan 2012 19:04:52 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -2.3 X-Spam-Level: X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_MED=-2.3] 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 A54x9uxPWMcE for ; Thu, 12 Jan 2012 19:04:52 -0800 (PST) Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 23D4C429E31 for ; Thu, 12 Jan 2012 19:04:52 -0800 (PST) Received: from zancas.localnet (fctnnbsc36w-156034076032.pppoe-dynamic.High-Speed.nb.bellaliant.net [156.34.76.32]) (authenticated bits=0) by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id q0D34k99020583 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Thu, 12 Jan 2012 23:04:47 -0400 Received: from bremner by zancas.localnet with local (Exim 4.77) (envelope-from ) id 1RlXRe-0002hZ-2U; Thu, 12 Jan 2012 23:04:46 -0400 From: David Bremner To: David Edmondson , notmuch@notmuchmail.org Subject: Re: [PATCH v2] emacs: Helpers for notmuch developers. In-Reply-To: References: <1325685678-12710-1-git-send-email-dme@dme.org> <1325844199-1812-1-git-send-email-dme@dme.org> <87lipjk9t9.fsf@zancas.localnet> <87mx9xw475.fsf@zancas.localnet> User-Agent: Notmuch/0.10.2+177~g38546e4 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) Date: Thu, 12 Jan 2012 23:04:46 -0400 Message-ID: <871ur4ti9d.fsf@zancas.localnet> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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: Fri, 13 Jan 2012 03:04:52 -0000 On Mon, 09 Jan 2012 11:16:20 +0000, David Edmondson wrote: > On Mon, 09 Jan 2012 06:38:54 -0400, David Bremner wrote: > Could you try running > (notmuch-dev-delete-branch "review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results") > when inside that repository please? Sorry for the delay. zancas:/tmp/notmuch-dev-bremner (git)-[master]-% git branch * master review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results It looks likes somebody needs to use git branch -D? Debugger entered--Lisp error: (error "The branch 'review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results' is not fully merged.") signal(error ("The branch 'review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results' is not fully merged.")) error("The branch 'review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results' is not fully merged.") magit-run*(("git" "--no-pager" "branch" "-d" "review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results")) #[nil "\303\304 B\n\"!\207" [magit-git-executable magit-git-standard-options args magit-run* append] 4]() magit-refresh-wrapper(#[nil "\303\304 B\n\"!\207" [magit-git-executable magit-git-standard-options args magit-run* append] 4]) magit-run-git("branch" "-d" "review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results") magit-delete-branch("review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results") notmuch-dev-delete-branch("review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results") eval((notmuch-dev-delete-branch "review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results")) eval-last-sexp-1(nil)