Re: [PATCH] notmuch-dev: Forcibly delete branches.

diff --git a/fa/713ebbd18ff17578bdc03d5da6b1b6f8adee38 b/fa/713ebbd18ff17578bdc03d5da6b1b6f8adee38
new file mode 100644 (file)
index 0000000..33a14b2
--- /dev/null
+++ b/fa/713ebbd18ff17578bdc03d5da6b1b6f8adee38
@@ -0,0 +1,77 @@
+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 CD01042116D\r
+       for <notmuch@notmuchmail.org>; Fri, 13 Jan 2012 04:25:36 -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 tlld4gXuekMX for <notmuch@notmuchmail.org>;\r
+       Fri, 13 Jan 2012 04:25:36 -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 2A78942116C\r
+       for <notmuch@notmuchmail.org>; Fri, 13 Jan 2012 04:25:36 -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 q0DCPWBm014042\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);\r
+       Fri, 13 Jan 2012 08:25:33 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.77)\r
+       (envelope-from <bremner@unb.ca>)\r
+       id 1RlgCK-00063z-EE; Fri, 13 Jan 2012 08:25:32 -0400\r
+From: David Bremner <david@tethera.net>\r
+To: David Edmondson <dme@dme.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] notmuch-dev: Forcibly delete branches.\r
+In-Reply-To: <1326450329-10108-1-git-send-email-dme@dme.org>\r
+References: <871ur4ti9d.fsf@zancas.localnet>\r
+       <1326450329-10108-1-git-send-email-dme@dme.org>\r
+User-Agent: Notmuch/0.10.2+178~gb6b26f4 (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Fri, 13 Jan 2012 08:25:32 -0400\r
+Message-ID: <87wr8v23ib.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 12:25:36 -0000\r
+\r
+On Fri, 13 Jan 2012 10:25:29 +0000, David Edmondson <dme@dme.org> wrote:\r
+> `magit-delete-branch' runs "git branch -d <branch>", which refuses to\r
+> delete branches that are not fully merged. Given that we don't care\r
+> and don't want to be stalled, use "git branch -D <branch>" directly.\r
+> ---\r
+\r
+Yes, that seems to fix it. \r
+\r
+Two more questions/comments.\r
+\r
+- Should n-d-s-review-patch update to current master? perhaps with\r
+  prefix?\r
+\r
+- I think more escaping of branch names is needed. In particular, branch\r
+  names with {} in them get created ok, but then don't work very well in\r
+  magit.  E.g. running log I get "Args out of range: "face}s", 5, 10"\r
+  with the branch name\r
+\r
+       review/patch-v2-emacs-logically-group-def{custom,face}s\r
+\r
+d\r