1 Return-Path: <david@tethera.net>
\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 1DF52431FC0
\r
6 for <notmuch@notmuchmail.org>; Wed, 9 Apr 2014 04:22:43 -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 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id WS5CLnlNEZI0 for <notmuch@notmuchmail.org>;
\r
16 Wed, 9 Apr 2014 04:22:35 -0700 (PDT)
\r
17 Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
\r
18 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 4A940431FBC
\r
21 for <notmuch@notmuchmail.org>; Wed, 9 Apr 2014 04:22:35 -0700 (PDT)
\r
22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
\r
23 (envelope-from <david@tethera.net>)
\r
24 id 1WXqaM-0000aG-7p; Wed, 09 Apr 2014 08:22:30 -0300
\r
25 Received: (nullmailer pid 10943 invoked by uid 1000); Wed, 09 Apr 2014
\r
27 From: David Bremner <david@tethera.net>
\r
28 To: "W. Trevor King" <wking@tremily.us>, notmuch <notmuch@notmuchmail.org>
\r
29 Subject: Re: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream}
\r
32 <151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us>
\r
33 References: <878urg849d.fsf@zancas.localnet>
\r
34 <151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us>
\r
35 User-Agent: Notmuch/0.17+164~g31fc76b (http://notmuchmail.org) Emacs/24.3.1
\r
36 (x86_64-pc-linux-gnu)
\r
37 Date: Wed, 09 Apr 2014 08:22:26 -0300
\r
38 Message-ID: <871tx67nnx.fsf@zancas.localnet>
\r
40 Content-Type: text/plain
\r
41 X-BeenThere: notmuch@notmuchmail.org
\r
42 X-Mailman-Version: 2.1.13
\r
44 List-Id: "Use and development of the notmuch mail system."
\r
45 <notmuch.notmuchmail.org>
\r
46 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
48 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
49 List-Post: <mailto:notmuch@notmuchmail.org>
\r
50 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
51 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
53 X-List-Received-Date: Wed, 09 Apr 2014 11:22:43 -0000
\r
55 "W. Trevor King" <wking@tremily.us> writes:
\r
57 > The changes just landed with c200167 (nmbug: Add 'clone' and replace
\r
58 > FETCH_HEAD with @{upstream}, 2014-03-09).
\r
60 > The preferred markup language for NEWS seems to be Markdown, which is
\r
61 > parsed by devel/news2wiki.pl into Markdown chunks for rendering by
\r
64 > [1]: http://notmuchmail.org/news/
\r
66 > NEWS | 20 ++++++++++++++++++++
\r
67 > 1 file changed, 20 insertions(+)
\r
69 > diff --git a/NEWS b/NEWS
\r
70 > index d4f4ea4..e26fa0a 100644
\r
73 > @@ -20,6 +20,26 @@ Bug fix for saved searches with newlines in them.
\r
74 > Split lines confuse `notmuch count --batch`, so we remove embedded
\r
75 > newlines before calling notmuch count.
\r
80 > +nmbug adds a `clone` command for setting up the initial repository and
\r
81 > +uses `@{upstream}` instead of `FETCH_HEAD` to track upstream changes.
\r
83 > + The `@{upstream}` change reduces ambiguity when fetching multiple
\r
84 > + branches, but requires existing users update their bare `NMBGIT`
\r
85 > + repository (usually `~/.nmbug`) to a non-bare repository. The
\r
86 > + easiest way to do this is:
\r
88 That bit about non-bare seems to be untrue/misleading?
\r
90 As a step 0, I guess commit any tag changes to nmbug?
\r
92 > + 1. Push any local commits to a remote repository.
\r
93 > + 2. Remove your `NMBGIT` repository (e.g. `mv .nmbug .nmbug.bak`).
\r
94 > + 3. Use the new `clone` command to create a fresh clone:
\r
96 > + nmbug clone nmbug@nmbug.tethera.net:nmbug-tags
\r
99 Jani mentioned on IRC that some people might track nmbug in a read only
\r
102 > + 4. If you had local commits in step 1, add a remote for that
\r
103 > + repository and fetch them into the new repository.
\r
105 Is the "remote repository" in step 1 meant to be the central repo? or
\r