72/645a15df9b7ca65661c12f6e956d45ae5fdde0

   1 Return-Path: <bremner@unb.ca>\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 CF07E429E32\r
   6         for <notmuch@notmuchmail.org>; Thu, 12 Jan 2012 19:04:52 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -2.3\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\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 A54x9uxPWMcE for <notmuch@notmuchmail.org>;\r
  16         Thu, 12 Jan 2012 19:04:52 -0800 (PST)\r
  17 Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])\r
  18         (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
  19         (No client certificate requested)\r
  20         by olra.theworths.org (Postfix) with ESMTPS id 23D4C429E31\r
  21         for <notmuch@notmuchmail.org>; Thu, 12 Jan 2012 19:04:52 -0800 (PST)\r
  22 Received: from zancas.localnet\r
  23         (fctnnbsc36w-156034076032.pppoe-dynamic.High-Speed.nb.bellaliant.net\r
  24         [156.34.76.32]) (authenticated bits=0)\r
  25         by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id q0D34k99020583\r
  26         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);\r
  27         Thu, 12 Jan 2012 23:04:47 -0400\r
  28 Received: from bremner by zancas.localnet with local (Exim 4.77)\r
  29         (envelope-from <bremner@unb.ca>)\r
  30         id 1RlXRe-0002hZ-2U; Thu, 12 Jan 2012 23:04:46 -0400\r
  31 From: David Bremner <david@tethera.net>\r
  32 To: David Edmondson <dme@dme.org>, notmuch@notmuchmail.org\r
  33 Subject: Re: [PATCH v2] emacs: Helpers for notmuch developers.\r
  34 In-Reply-To: <cun1ur986t7.fsf@hotblack-desiato.hh.sledj.net>\r
  35 References: <1325685678-12710-1-git-send-email-dme@dme.org>\r
  36         <1325844199-1812-1-git-send-email-dme@dme.org>\r
  37         <87lipjk9t9.fsf@zancas.localnet>\r
  38         <cunboqd1dye.fsf@hotblack-desiato.hh.sledj.net>\r
  39         <87mx9xw475.fsf@zancas.localnet>\r
  40         <cun1ur986t7.fsf@hotblack-desiato.hh.sledj.net>\r
  41 User-Agent: Notmuch/0.10.2+177~g38546e4 (http://notmuchmail.org) Emacs/23.3.1\r
  42         (x86_64-pc-linux-gnu)\r
  43 Date: Thu, 12 Jan 2012 23:04:46 -0400\r
  44 Message-ID: <871ur4ti9d.fsf@zancas.localnet>\r
  45 MIME-Version: 1.0\r
  46 Content-Type: text/plain; charset=us-ascii\r
  47 X-BeenThere: notmuch@notmuchmail.org\r
  48 X-Mailman-Version: 2.1.13\r
  49 Precedence: list\r
  50 List-Id: "Use and development of the notmuch mail system."\r
  51         <notmuch.notmuchmail.org>\r
  52 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  53         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  54 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  55 List-Post: <mailto:notmuch@notmuchmail.org>\r
  56 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  57 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  58         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  59 X-List-Received-Date: Fri, 13 Jan 2012 03:04:52 -0000\r
  60 \r
  61 On Mon, 09 Jan 2012 11:16:20 +0000, David Edmondson <dme@dme.org> wrote:\r
  62 > On Mon, 09 Jan 2012 06:38:54 -0400, David Bremner <david@tethera.net> wrote:\r
  63 > Could you try running\r
  64 >       (notmuch-dev-delete-branch "review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results")\r
  65 > when inside that repository please?\r
  66 \r
  67 Sorry for the delay.\r
  68 \r
  69 zancas:/tmp/notmuch-dev-bremner  (git)-[master]-% git branch   \r
  70 * master\r
  71   review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results\r
  72 \r
  73 It looks likes somebody needs to use git branch -D?\r
  74 \r
  75 \r
  76 \r
  77 \r
  78 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
  79   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
  80   error("The branch 'review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results' is not fully merged.")\r
  81   magit-run*(("git" "--no-pager" "branch" "-d" "review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results"))\r
  82   #[nil "\303\304\b      B\n\"!\207" [magit-git-executable magit-git-standard-options args magit-run* append] 4]()\r
  83   magit-refresh-wrapper(#[nil "\303\304\b        B\n\"!\207" [magit-git-executable magit-git-standard-options args magit-run* append] 4])\r
  84   magit-run-git("branch" "-d" "review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results")\r
  85   magit-delete-branch("review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results")\r
  86   notmuch-dev-delete-branch("review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results")\r
  87   eval((notmuch-dev-delete-branch "review/patch-emacs-don't-signal-an-error-when-reaching-the-end-of-the-search-results"))\r
  88   eval-last-sexp-1(nil)\r
  89 \r