From: Tomi Ollila Date: Wed, 16 Apr 2014 20:21:31 +0000 (+0300) Subject: Re: [PATCH v2] NEWS: Document the recent 'nmbug clone' and @{upstream} changes X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8fe4e447e8e73d71b78ca941d5f0cda5b15bb355;p=notmuch-archives.git Re: [PATCH v2] NEWS: Document the recent 'nmbug clone' and @{upstream} changes --- diff --git a/9c/f0edcd2e2e8aa3a1fa24841d3e8e2d6f39d10a b/9c/f0edcd2e2e8aa3a1fa24841d3e8e2d6f39d10a new file mode 100644 index 000000000..e286907e8 --- /dev/null +++ b/9c/f0edcd2e2e8aa3a1fa24841d3e8e2d6f39d10a @@ -0,0 +1,130 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 40A8D431FBD + for ; Wed, 16 Apr 2014 13:21:47 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id LC2-lwWtu4xz for ; + Wed, 16 Apr 2014 13:21:40 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id F3B87431FAE + for ; Wed, 16 Apr 2014 13:21:39 -0700 (PDT) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id 5BD2B10008F; + Wed, 16 Apr 2014 23:21:32 +0300 (EEST) +From: Tomi Ollila +To: "W. Trevor King" , 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) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: quoted-printable +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 16 Apr 2014 20:21:47 -0000 + +On Wed, Apr 16 2014, "W. Trevor King" 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