From: Tomi Ollila <tomi.ollila@iki.fi>
To: "W. Trevor King" <wking@tremily.us>, notmuch@notmuchmail.org
Subject: Re: [PATCH v2] NEWS: Document the recent 'nmbug clone' and
	@{upstream}	changes
In-Reply-To:
 <51bb7db1cd7cc43f00c9c5cdab9c01450058fcf7.1397595340.git.wking@tremily.us>
References:
 <51bb7db1cd7cc43f00c9c5cdab9c01450058fcf7.1397595340.git.wking@tremily.us>
User-Agent: Notmuch/0.17+201~g56da2d6 (http://notmuchmail.org) Emacs/24.3.1
	(x86_64-unknown-linux-gnu)
Date: Wed, 16 Apr 2014 23:21:31 +0300
Message-ID: <m2ioq9auus.fsf@guru.guru-group.fi>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: list

On Wed, Apr 16 2014, "W. Trevor King" <wking@tremily.us> wrote:

> The changes landed with c200167 (nmbug: Add 'clone' and replace
> FETCH_HEAD with @{upstream}, 2014-03-09).
>
> The preferred markup language for NEWS seems to be Markdown, which is
> parsed by devel/news2wiki.pl into Markdown chunks for rendering by
> ikiwiki [1].
>
> [1]: http://notmuchmail.org/news/
> ---

LGTM (source $ news2wiki.pl-generated mdwn).

> Changes since v1 [1]:
>
> * Use HTTP (instead of the Git protocol) for the remote URL [2].
> * Remove =E2=80=9Cbare=E2=80=9D from the text motivating a fresh clone.
>   Replace it with a reference to remote-tracking branches [2,3].
> * Elaborate on the local-commit-backup step (step 1) [4].
>
> [1]: id:151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tre=
mily.us
>      http://thread.gmane.org/gmane.mail.notmuch.general/17457/focus=3D178=
12
> [2]: id:20140409210108.GB21805@odin.tremily.us
>      http://article.gmane.org/gmane.mail.notmuch.general/17817
> [3]: id:87bnw2wcwq.fsf@zancas.localnet
>      http://article.gmane.org/gmane.mail.notmuch.general/17885
> [4]: id:20140410020559.GC21805@odin.tremily.us
>      http://article.gmane.org/gmane.mail.notmuch.general/17819
>
>  NEWS | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
>
> diff --git a/NEWS b/NEWS
> index d4f4ea4..630607f 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -20,6 +20,28 @@ Bug fix for saved searches with newlines in them.
>    Split lines confuse `notmuch count --batch`, so we remove embedded
>    newlines before calling notmuch count.
>=20=20
> +nmbug
> +-----
> +
> +nmbug adds a `clone` command for setting up the initial repository and
> +uses `@{upstream}` instead of `FETCH_HEAD` to track upstream changes.
> +
> +  The `@{upstream}` change reduces ambiguity when fetching multiple
> +  branches, but requires existing users update their `NMBGIT`
> +  repository (usually `~/.nmbug`) to distinguish between local and
> +  remote-tracking branches.  The easiest way to do this is:
> +
> +  1. If you have any purely local commits (i.e. they aren't in the
> +     nmbug repository on nmbug.tethera.net), push them to a remote
> +     repository.  We'll restore them from the backup in step 4.
> +  2. Remove your `NMBGIT` repository (e.g. `mv .nmbug .nmbug.bak`).
> +  3. Use the new `clone` command to create a fresh clone:
> +
> +        nmbug clone http://nmbug.tethera.net/git/nmbug-tags.git
> +
> +  4. If you had local commits in step 1, add a remote for that
> +     repository and fetch them into the new repository.
> +
>  Notmuch 0.17 (2013-12-30)
>  =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
>=20=20
> --=20
> 1.9.1.353.gc66d89d
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch