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
Date: Wed, 16 Apr 2014 23:21:31 +0300 [thread overview]
Message-ID: <m2ioq9auus.fsf@guru.guru-group.fi> (raw)
In-Reply-To: <51bb7db1cd7cc43f00c9c5cdab9c01450058fcf7.1397595340.git.wking@tremily.us>
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 “bare” 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@tremily.us
> http://thread.gmane.org/gmane.mail.notmuch.general/17457/focus=17812
> [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.
>
> +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)
> =========================
>
> --
> 1.9.1.353.gc66d89d
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
next prev parent reply other threads:[~2014-04-16 20:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-15 21:03 [PATCH v2] NEWS: Document the recent 'nmbug clone' and @{upstream} changes W. Trevor King
2014-04-16 20:21 ` Tomi Ollila [this message]
2014-04-17 22:59 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2ioq9auus.fsf@guru.guru-group.fi \
--to=tomi.ollila@iki.fi \
--cc=notmuch@notmuchmail.org \
--cc=wking@tremily.us \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).