1 Return-Path: <tomi.ollila@iki.fi>
\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 40A8D431FBD
\r
6 for <notmuch@notmuchmail.org>; Wed, 16 Apr 2014 13:21:47 -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 LC2-lwWtu4xz for <notmuch@notmuchmail.org>;
\r
16 Wed, 16 Apr 2014 13:21:40 -0700 (PDT)
\r
17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
18 by olra.theworths.org (Postfix) with ESMTP id F3B87431FAE
\r
19 for <notmuch@notmuchmail.org>; Wed, 16 Apr 2014 13:21:39 -0700 (PDT)
\r
20 Received: from guru.guru-group.fi (localhost [IPv6:::1])
\r
21 by guru.guru-group.fi (Postfix) with ESMTP id 5BD2B10008F;
\r
22 Wed, 16 Apr 2014 23:21:32 +0300 (EEST)
\r
23 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
24 To: "W. Trevor King" <wking@tremily.us>, notmuch@notmuchmail.org
\r
25 Subject: Re: [PATCH v2] NEWS: Document the recent 'nmbug clone' and
\r
28 <51bb7db1cd7cc43f00c9c5cdab9c01450058fcf7.1397595340.git.wking@tremily.us>
\r
30 <51bb7db1cd7cc43f00c9c5cdab9c01450058fcf7.1397595340.git.wking@tremily.us>
\r
31 User-Agent: Notmuch/0.17+201~g56da2d6 (http://notmuchmail.org) Emacs/24.3.1
\r
32 (x86_64-unknown-linux-gnu)
\r
33 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
\r
34 $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
\r
35 !)g;OY^,BjTbr)Np:%c_o'jj,Z
\r
36 Date: Wed, 16 Apr 2014 23:21:31 +0300
\r
37 Message-ID: <m2ioq9auus.fsf@guru.guru-group.fi>
\r
39 Content-Type: text/plain; charset=utf-8
\r
40 Content-Transfer-Encoding: quoted-printable
\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, 16 Apr 2014 20:21:47 -0000
\r
55 On Wed, Apr 16 2014, "W. Trevor King" <wking@tremily.us> wrote:
\r
57 > The changes 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
67 LGTM (source $ news2wiki.pl-generated mdwn).
\r
69 > Changes since v1 [1]:
\r
71 > * Use HTTP (instead of the Git protocol) for the remote URL [2].
\r
72 > * Remove =E2=80=9Cbare=E2=80=9D from the text motivating a fresh clone.
\r
73 > Replace it with a reference to remote-tracking branches [2,3].
\r
74 > * Elaborate on the local-commit-backup step (step 1) [4].
\r
76 > [1]: id:151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tre=
\r
78 > http://thread.gmane.org/gmane.mail.notmuch.general/17457/focus=3D178=
\r
80 > [2]: id:20140409210108.GB21805@odin.tremily.us
\r
81 > http://article.gmane.org/gmane.mail.notmuch.general/17817
\r
82 > [3]: id:87bnw2wcwq.fsf@zancas.localnet
\r
83 > http://article.gmane.org/gmane.mail.notmuch.general/17885
\r
84 > [4]: id:20140410020559.GC21805@odin.tremily.us
\r
85 > http://article.gmane.org/gmane.mail.notmuch.general/17819
\r
87 > NEWS | 22 ++++++++++++++++++++++
\r
88 > 1 file changed, 22 insertions(+)
\r
90 > diff --git a/NEWS b/NEWS
\r
91 > index d4f4ea4..630607f 100644
\r
94 > @@ -20,6 +20,28 @@ Bug fix for saved searches with newlines in them.
\r
95 > Split lines confuse `notmuch count --batch`, so we remove embedded
\r
96 > newlines before calling notmuch count.
\r
101 > +nmbug adds a `clone` command for setting up the initial repository and
\r
102 > +uses `@{upstream}` instead of `FETCH_HEAD` to track upstream changes.
\r
104 > + The `@{upstream}` change reduces ambiguity when fetching multiple
\r
105 > + branches, but requires existing users update their `NMBGIT`
\r
106 > + repository (usually `~/.nmbug`) to distinguish between local and
\r
107 > + remote-tracking branches. The easiest way to do this is:
\r
109 > + 1. If you have any purely local commits (i.e. they aren't in the
\r
110 > + nmbug repository on nmbug.tethera.net), push them to a remote
\r
111 > + repository. We'll restore them from the backup in step 4.
\r
112 > + 2. Remove your `NMBGIT` repository (e.g. `mv .nmbug .nmbug.bak`).
\r
113 > + 3. Use the new `clone` command to create a fresh clone:
\r
115 > + nmbug clone http://nmbug.tethera.net/git/nmbug-tags.git
\r
117 > + 4. If you had local commits in step 1, add a remote for that
\r
118 > + repository and fetch them into the new repository.
\r
120 > Notmuch 0.17 (2013-12-30)
\r
121 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
\r
125 > 1.9.1.353.gc66d89d
\r
127 > _______________________________________________
\r
128 > notmuch mailing list
\r
129 > notmuch@notmuchmail.org
\r
130 > http://notmuchmail.org/mailman/listinfo/notmuch
\r