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

diff --git a/42/8bd5b11c8e873e8ff3930b7908372ea06f68d0 b/42/8bd5b11c8e873e8ff3930b7908372ea06f68d0
new file mode 100644 (file)
index 0000000..c2f017d
--- /dev/null
+++ b/42/8bd5b11c8e873e8ff3930b7908372ea06f68d0
@@ -0,0 +1,107 @@
+Return-Path: <david@tethera.net>\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 1DF52431FC0\r
+       for <notmuch@notmuchmail.org>; Wed,  9 Apr 2014 04:22:43 -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 tests=[none]\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 WS5CLnlNEZI0 for <notmuch@notmuchmail.org>;\r
+       Wed,  9 Apr 2014 04:22:35 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 4A940431FBC\r
+       for <notmuch@notmuchmail.org>; Wed,  9 Apr 2014 04:22:35 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <david@tethera.net>)\r
+       id 1WXqaM-0000aG-7p; Wed, 09 Apr 2014 08:22:30 -0300\r
+Received: (nullmailer pid 10943 invoked by uid 1000); Wed, 09 Apr 2014\r
+       11:22:26 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: "W. Trevor King" <wking@tremily.us>, notmuch <notmuch@notmuchmail.org>\r
+Subject: Re: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream}\r
+       changes\r
+In-Reply-To:\r
+ <151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us>\r
+References: <878urg849d.fsf@zancas.localnet>\r
+       <151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us>\r
+User-Agent: Notmuch/0.17+164~g31fc76b (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Wed, 09 Apr 2014 08:22:26 -0300\r
+Message-ID: <871tx67nnx.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Wed, 09 Apr 2014 11:22:43 -0000\r
+\r
+"W. Trevor King" <wking@tremily.us> writes:\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
+That bit about non-bare seems to be untrue/misleading?\r
+\r
+As a step 0, I guess commit any tag changes to nmbug?\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
+\r
+Jani mentioned on IRC that some people might track nmbug in a read only\r
+way via git://\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
+Is the "remote repository" in step 1 meant to be the central repo? or\r
+just a backup?\r
+\r