Re: [PATCH v2] emacs: Helpers for notmuch developers.

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