--- /dev/null
+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 185A9431FBF\r
+ for <notmuch@notmuchmail.org>; Tue, 15 Apr 2014 14:04:31 -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 z9T+3bBl3qmo for <notmuch@notmuchmail.org>;\r
+ Tue, 15 Apr 2014 14:04:23 -0700 (PDT)\r
+Received: from qmta03.westchester.pa.mail.comcast.net\r
+ (qmta03.westchester.pa.mail.comcast.net [76.96.62.32])\r
+ by olra.theworths.org (Postfix) with ESMTP id 35946431FBD\r
+ for <notmuch@notmuchmail.org>; Tue, 15 Apr 2014 14:04:23 -0700 (PDT)\r
+Received: from omta17.westchester.pa.mail.comcast.net ([76.96.62.89])\r
+ by qmta03.westchester.pa.mail.comcast.net with comcast\r
+ id qEmz1n0031vXlb853M4Ng0; Tue, 15 Apr 2014 21:04:22 +0000\r
+Received: from odin.tremily.us ([24.18.63.50])\r
+ by omta17.westchester.pa.mail.comcast.net with comcast\r
+ id qM4M1n00A152l3L3dM4MaM; Tue, 15 Apr 2014 21:04:22 +0000\r
+Received: from mjolnir.tremily.us (unknown [192.168.0.140])\r
+ by odin.tremily.us (Postfix) with ESMTPS id C2F411148955;\r
+ Tue, 15 Apr 2014 14:04:20 -0700 (PDT)\r
+Received: (nullmailer pid 12690 invoked by uid 1000);\r
+ Tue, 15 Apr 2014 21:04:02 -0000\r
+From: "W. Trevor King" <wking@tremily.us>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2] NEWS: Document the recent 'nmbug clone' and @{upstream}\r
+ changes\r
+Date: Tue, 15 Apr 2014 14:03:56 -0700\r
+Message-Id:\r
+ <51bb7db1cd7cc43f00c9c5cdab9c01450058fcf7.1397595340.git.wking@tremily.us>\r
+X-Mailer: git-send-email 1.9.1.353.gc66d89d\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=UTF-8\r
+Content-Transfer-Encoding: 8bit\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
+ s=q20140121; t=1397595862;\r
+ bh=GRpNFnvXfZp+Hs5Qfr8gx2/WPLCWjR/J6fjhmPcib2A=;\r
+ h=Received:Received:Received:Received:From:To:Subject:Date:\r
+ Message-Id:MIME-Version:Content-Type;\r
+ b=sLZJzTJUMP7LLU2+RQWeHSugvxjA5oXoYdtv8YeALXXzaN9xJwEWyvEd14jeUFCxk\r
+ KTgXeLIsiiSdOmgnDxsBIVQWTAOZhzPTwqdES7Tur7EbQuMbHbC4O0YQjCQjR2bdlf\r
+ TEYgKcq6RWUiTpEmXyx5XQoc4CJH+pA5aZAip3aSyvPY+AmhalyFIZ28slkxV/sUmv\r
+ Lnf7P+vvn8uSjWbKWMBiehr8Gm7BPvAQLxKd2b+ZZ2YLzrXitNaVmZc2Lw5pLJBkLt\r
+ yCih1wr7R8nQiywoSIpXHV5nn9SixjfReZbc4C2Y9mEBGFaHNV50StIxa36UzUxbm7\r
+ bozz2vs8zsX9A==\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, 15 Apr 2014 21:04:31 -0000\r
+\r
+The changes 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
+Changes since v1 [1]:\r
+\r
+* Use HTTP (instead of the Git protocol) for the remote URL [2].\r
+* Remove “bare” from the text motivating a fresh clone.\r
+ Replace it with a reference to remote-tracking branches [2,3].\r
+* Elaborate on the local-commit-backup step (step 1) [4].\r
+\r
+[1]: id:151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us\r
+ http://thread.gmane.org/gmane.mail.notmuch.general/17457/focus=17812\r
+[2]: id:20140409210108.GB21805@odin.tremily.us\r
+ http://article.gmane.org/gmane.mail.notmuch.general/17817\r
+[3]: id:87bnw2wcwq.fsf@zancas.localnet\r
+ http://article.gmane.org/gmane.mail.notmuch.general/17885\r
+[4]: id:20140410020559.GC21805@odin.tremily.us\r
+ http://article.gmane.org/gmane.mail.notmuch.general/17819\r
+\r
+ NEWS | 22 ++++++++++++++++++++++\r
+ 1 file changed, 22 insertions(+)\r
+\r
+diff --git a/NEWS b/NEWS\r
+index d4f4ea4..630607f 100644\r
+--- a/NEWS\r
++++ b/NEWS\r
+@@ -20,6 +20,28 @@ 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 `NMBGIT`\r
++ repository (usually `~/.nmbug`) to distinguish between local and\r
++ remote-tracking branches. The easiest way to do this is:\r
++\r
++ 1. If you have any purely local commits (i.e. they aren't in the\r
++ nmbug repository on nmbug.tethera.net), push them to a remote\r
++ repository. We'll restore them from the backup in step 4.\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 http://nmbug.tethera.net/git/nmbug-tags.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
+ Notmuch 0.17 (2013-12-30)\r
+ =========================\r
+ \r
+-- \r
+1.9.1.353.gc66d89d\r
+\r
projects / notmuch-archives.git / commitdiff