[PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream} changes

diff --git a/a9/207270ab507bad69ea536a7684ad9e32a03861 b/a9/207270ab507bad69ea536a7684ad9e32a03861
new file mode 100644 (file)
index 0000000..6878b8c
--- /dev/null
+++ b/a9/207270ab507bad69ea536a7684ad9e32a03861
@@ -0,0 +1,113 @@
+Return-Path: <wking@tremily.us>\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 96881431FC0\r
+       for <notmuch@notmuchmail.org>; Tue,  8 Apr 2014 08:58:07 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001]\r
+       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 cLPNPetPljsP for <notmuch@notmuchmail.org>;\r
+       Tue,  8 Apr 2014 08:58:00 -0700 (PDT)\r
+Received: from qmta01.westchester.pa.mail.comcast.net\r
+       (qmta01.westchester.pa.mail.comcast.net [76.96.62.16])\r
+       by olra.theworths.org (Postfix) with ESMTP id 0DE77431FBC\r
+       for <notmuch@notmuchmail.org>; Tue,  8 Apr 2014 08:57:59 -0700 (PDT)\r
+Received: from omta12.westchester.pa.mail.comcast.net ([76.96.62.44])\r
+       by qmta01.westchester.pa.mail.comcast.net with comcast\r
+       id nQNs1n0060xGWP851TxzZD; Tue, 08 Apr 2014 15:57:59 +0000\r
+Received: from odin.tremily.us ([24.18.63.50])\r
+       by omta12.westchester.pa.mail.comcast.net with comcast\r
+       id nTxx1n00b152l3L3YTxyPX; Tue, 08 Apr 2014 15:57:59 +0000\r
+Received: from mjolnir.tremily.us (unknown [192.168.0.140])\r
+       by odin.tremily.us (Postfix) with ESMTPS id 3BB3D110D802;\r
+       Tue,  8 Apr 2014 08:57:57 -0700 (PDT)\r
+Received: (nullmailer pid 3821 invoked by uid 1000);\r
+       Tue, 08 Apr 2014 15:57:44 -0000\r
+From: "W. Trevor King" <wking@tremily.us>\r
+To: notmuch <notmuch@notmuchmail.org>\r
+Subject: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream}\r
+       changes\r
+Date: Tue,  8 Apr 2014 08:57:38 -0700\r
+Message-Id:\r
+ <151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us>\r
+X-Mailer: git-send-email 1.9.1.353.gc66d89d\r
+In-Reply-To: <878urg849d.fsf@zancas.localnet>\r
+References: <878urg849d.fsf@zancas.localnet>\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
+       s=q20140121; t=1396972679;\r
+       bh=4FKvNSHLX/a5pU3rXZZnMhI+ZNAS4fj66i2kfOxeSCI=;\r
+       h=Received:Received:Received:Received:From:To:Subject:Date:\r
+       Message-Id;\r
+       b=eGAnrbhjO2IfomqSFug/648x+opFe5LNDd6FweV4ogD/4hZLVGSDpoOK9rBloMWfk\r
+       1h6ebxMwoJUPQ1Hq6utE0Hd78UKc3jdcv+ICZrPLw7Ubxk0b2T6oLjpJ8lX0j4ExE8\r
+       3unfRV9hLFCXiaI059Q7CKpncUhIuhZt8lnJKGbW2dR0GaD1jL8O9ZLmHo0cNOidX5\r
+       oN0QZam31MjCKHaxv7D1Zb0oNel3o+PAwEPCyVd4Kc023UA5C2Mxwshmr6d/vtqxeJ\r
+       HZtodcsJxFSprV6kuYiu08Ut+kQm9erhL+WXnkIAsw5G1J2CgRgNXdG3OcNhiJuuhR\r
+       AQnjMlnWkYhBg==\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: Tue, 08 Apr 2014 15:58:07 -0000\r
+\r
+The changes just landed with c200167 (nmbug: Add 'clone' and replace\r
+FETCH_HEAD with @{upstream}, 2014-03-09).\r
+\r
+The preferred markup language for NEWS seems to be Markdown, which is\r
+parsed by devel/news2wiki.pl into Markdown chunks for rendering by\r
+ikiwiki [1].\r
+\r
+[1]: http://notmuchmail.org/news/\r
+---\r
+ NEWS | 20 ++++++++++++++++++++\r
+ 1 file changed, 20 insertions(+)\r
+\r
+diff --git a/NEWS b/NEWS\r
+index d4f4ea4..e26fa0a 100644\r
+--- a/NEWS\r
++++ b/NEWS\r
+@@ -20,6 +20,26 @@ Bug fix for saved searches with newlines in them.\r
+   Split lines confuse `notmuch count --batch`, so we remove embedded\r
+   newlines before calling notmuch count.\r
+ \r
++nmbug\r
++-----\r
++\r
++nmbug adds a `clone` command for setting up the initial repository and\r
++uses `@{upstream}` instead of `FETCH_HEAD` to track upstream changes.\r
++\r
++  The `@{upstream}` change reduces ambiguity when fetching multiple\r
++  branches, but requires existing users update their bare `NMBGIT`\r
++  repository (usually `~/.nmbug`) to a non-bare repository.  The\r
++  easiest way to do this is:\r
++\r
++  1. Push any local commits to a remote repository.\r
++  2. Remove your `NMBGIT` repository (e.g. `mv .nmbug .nmbug.bak`).\r
++  3. Use the new `clone` command to create a fresh clone:\r
++\r
++        nmbug clone nmbug@nmbug.tethera.net:nmbug-tags\r
++\r
++  4. If you had local commits in step 1, add a remote for that\r
++     repository and fetch them into the new repository.\r
++\r
+ Notmuch 0.17 (2013-12-30)\r
+ =========================\r
+ \r
+-- \r
+1.9.1.353.gc66d89d\r
+\r