--- /dev/null
+Return-Path: <tomi.ollila@iki.fi>\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 40A8D431FBD\r
+ for <notmuch@notmuchmail.org>; Wed, 16 Apr 2014 13:21:47 -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 LC2-lwWtu4xz for <notmuch@notmuchmail.org>;\r
+ Wed, 16 Apr 2014 13:21:40 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id F3B87431FAE\r
+ for <notmuch@notmuchmail.org>; Wed, 16 Apr 2014 13:21:39 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id 5BD2B10008F;\r
+ Wed, 16 Apr 2014 23:21:32 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: "W. Trevor King" <wking@tremily.us>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2] NEWS: Document the recent 'nmbug clone' and\r
+ @{upstream} changes\r
+In-Reply-To:\r
+ <51bb7db1cd7cc43f00c9c5cdab9c01450058fcf7.1397595340.git.wking@tremily.us>\r
+References:\r
+ <51bb7db1cd7cc43f00c9c5cdab9c01450058fcf7.1397595340.git.wking@tremily.us>\r
+User-Agent: Notmuch/0.17+201~g56da2d6 (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Wed, 16 Apr 2014 23:21:31 +0300\r
+Message-ID: <m2ioq9auus.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Transfer-Encoding: quoted-printable\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, 16 Apr 2014 20:21:47 -0000\r
+\r
+On Wed, Apr 16 2014, "W. Trevor King" <wking@tremily.us> wrote:\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
+\r
+LGTM (source $ news2wiki.pl-generated mdwn).\r
+\r
+> Changes since v1 [1]:\r
+>\r
+> * Use HTTP (instead of the Git protocol) for the remote URL [2].\r
+> * Remove =E2=80=9Cbare=E2=80=9D 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@tre=\r
+mily.us\r
+> http://thread.gmane.org/gmane.mail.notmuch.general/17457/focus=3D178=\r
+12\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
+>=20=20\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
+> =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
+=3D\r
+>=20=20\r
+> --=20\r
+> 1.9.1.353.gc66d89d\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff