1 Return-Path: <wking@tremily.us>
\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 185A9431FBF
\r
6 for <notmuch@notmuchmail.org>; Tue, 15 Apr 2014 14:04:31 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001]
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id z9T+3bBl3qmo for <notmuch@notmuchmail.org>;
\r
17 Tue, 15 Apr 2014 14:04:23 -0700 (PDT)
\r
18 Received: from qmta03.westchester.pa.mail.comcast.net
\r
19 (qmta03.westchester.pa.mail.comcast.net [76.96.62.32])
\r
20 by olra.theworths.org (Postfix) with ESMTP id 35946431FBD
\r
21 for <notmuch@notmuchmail.org>; Tue, 15 Apr 2014 14:04:23 -0700 (PDT)
\r
22 Received: from omta17.westchester.pa.mail.comcast.net ([76.96.62.89])
\r
23 by qmta03.westchester.pa.mail.comcast.net with comcast
\r
24 id qEmz1n0031vXlb853M4Ng0; Tue, 15 Apr 2014 21:04:22 +0000
\r
25 Received: from odin.tremily.us ([24.18.63.50])
\r
26 by omta17.westchester.pa.mail.comcast.net with comcast
\r
27 id qM4M1n00A152l3L3dM4MaM; Tue, 15 Apr 2014 21:04:22 +0000
\r
28 Received: from mjolnir.tremily.us (unknown [192.168.0.140])
\r
29 by odin.tremily.us (Postfix) with ESMTPS id C2F411148955;
\r
30 Tue, 15 Apr 2014 14:04:20 -0700 (PDT)
\r
31 Received: (nullmailer pid 12690 invoked by uid 1000);
\r
32 Tue, 15 Apr 2014 21:04:02 -0000
\r
33 From: "W. Trevor King" <wking@tremily.us>
\r
34 To: notmuch@notmuchmail.org
\r
35 Subject: [PATCH v2] NEWS: Document the recent 'nmbug clone' and @{upstream}
\r
37 Date: Tue, 15 Apr 2014 14:03:56 -0700
\r
39 <51bb7db1cd7cc43f00c9c5cdab9c01450058fcf7.1397595340.git.wking@tremily.us>
\r
40 X-Mailer: git-send-email 1.9.1.353.gc66d89d
\r
42 Content-Type: text/plain; charset=UTF-8
\r
43 Content-Transfer-Encoding: 8bit
\r
44 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;
\r
45 s=q20140121; t=1397595862;
\r
46 bh=GRpNFnvXfZp+Hs5Qfr8gx2/WPLCWjR/J6fjhmPcib2A=;
\r
47 h=Received:Received:Received:Received:From:To:Subject:Date:
\r
48 Message-Id:MIME-Version:Content-Type;
\r
49 b=sLZJzTJUMP7LLU2+RQWeHSugvxjA5oXoYdtv8YeALXXzaN9xJwEWyvEd14jeUFCxk
\r
50 KTgXeLIsiiSdOmgnDxsBIVQWTAOZhzPTwqdES7Tur7EbQuMbHbC4O0YQjCQjR2bdlf
\r
51 TEYgKcq6RWUiTpEmXyx5XQoc4CJH+pA5aZAip3aSyvPY+AmhalyFIZ28slkxV/sUmv
\r
52 Lnf7P+vvn8uSjWbKWMBiehr8Gm7BPvAQLxKd2b+ZZ2YLzrXitNaVmZc2Lw5pLJBkLt
\r
53 yCih1wr7R8nQiywoSIpXHV5nn9SixjfReZbc4C2Y9mEBGFaHNV50StIxa36UzUxbm7
\r
55 X-BeenThere: notmuch@notmuchmail.org
\r
56 X-Mailman-Version: 2.1.13
\r
58 List-Id: "Use and development of the notmuch mail system."
\r
59 <notmuch.notmuchmail.org>
\r
60 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
61 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
62 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
63 List-Post: <mailto:notmuch@notmuchmail.org>
\r
64 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
65 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
66 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
67 X-List-Received-Date: Tue, 15 Apr 2014 21:04:31 -0000
\r
69 The changes landed with c200167 (nmbug: Add 'clone' and replace
\r
70 FETCH_HEAD with @{upstream}, 2014-03-09).
\r
72 The preferred markup language for NEWS seems to be Markdown, which is
\r
73 parsed by devel/news2wiki.pl into Markdown chunks for rendering by
\r
76 [1]: http://notmuchmail.org/news/
\r
78 Changes since v1 [1]:
\r
80 * Use HTTP (instead of the Git protocol) for the remote URL [2].
\r
81 * Remove “bare” from the text motivating a fresh clone.
\r
82 Replace it with a reference to remote-tracking branches [2,3].
\r
83 * Elaborate on the local-commit-backup step (step 1) [4].
\r
85 [1]: id:151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us
\r
86 http://thread.gmane.org/gmane.mail.notmuch.general/17457/focus=17812
\r
87 [2]: id:20140409210108.GB21805@odin.tremily.us
\r
88 http://article.gmane.org/gmane.mail.notmuch.general/17817
\r
89 [3]: id:87bnw2wcwq.fsf@zancas.localnet
\r
90 http://article.gmane.org/gmane.mail.notmuch.general/17885
\r
91 [4]: id:20140410020559.GC21805@odin.tremily.us
\r
92 http://article.gmane.org/gmane.mail.notmuch.general/17819
\r
94 NEWS | 22 ++++++++++++++++++++++
\r
95 1 file changed, 22 insertions(+)
\r
97 diff --git a/NEWS b/NEWS
\r
98 index d4f4ea4..630607f 100644
\r
101 @@ -20,6 +20,28 @@ Bug fix for saved searches with newlines in them.
\r
102 Split lines confuse `notmuch count --batch`, so we remove embedded
\r
103 newlines before calling notmuch count.
\r
108 +nmbug adds a `clone` command for setting up the initial repository and
\r
109 +uses `@{upstream}` instead of `FETCH_HEAD` to track upstream changes.
\r
111 + The `@{upstream}` change reduces ambiguity when fetching multiple
\r
112 + branches, but requires existing users update their `NMBGIT`
\r
113 + repository (usually `~/.nmbug`) to distinguish between local and
\r
114 + remote-tracking branches. The easiest way to do this is:
\r
116 + 1. If you have any purely local commits (i.e. they aren't in the
\r
117 + nmbug repository on nmbug.tethera.net), push them to a remote
\r
118 + repository. We'll restore them from the backup in step 4.
\r
119 + 2. Remove your `NMBGIT` repository (e.g. `mv .nmbug .nmbug.bak`).
\r
120 + 3. Use the new `clone` command to create a fresh clone:
\r
122 + nmbug clone http://nmbug.tethera.net/git/nmbug-tags.git
\r
124 + 4. If you had local commits in step 1, add a remote for that
\r
125 + repository and fetch them into the new repository.
\r
127 Notmuch 0.17 (2013-12-30)
\r
128 =========================
\r