From: W. Trevor King Date: Wed, 9 Apr 2014 21:01:08 +0000 (+1700) Subject: Re: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream} changes X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c0027c252f4c35ac56aeffa57cd94a4897b1e562;p=notmuch-archives.git Re: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream} changes --- diff --git a/5f/46b2304e2be923821b8e0393d1ea30a66ce36b b/5f/46b2304e2be923821b8e0393d1ea30a66ce36b new file mode 100644 index 000000000..d5dfa7f8b --- /dev/null +++ b/5f/46b2304e2be923821b8e0393d1ea30a66ce36b @@ -0,0 +1,206 @@ +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 3E7FA431FBD + for ; Wed, 9 Apr 2014 14:01:18 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.1 +X-Spam-Level: +X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + RCVD_IN_DNSWL_NONE=-0.0001] 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 wRaIoa2olCgJ for ; + Wed, 9 Apr 2014 14:01:14 -0700 (PDT) +Received: from qmta12.westchester.pa.mail.comcast.net + (qmta12.westchester.pa.mail.comcast.net [76.96.59.227]) + by olra.theworths.org (Postfix) with ESMTP id 46F83431FBC + for ; Wed, 9 Apr 2014 14:01:14 -0700 (PDT) +Received: from omta14.westchester.pa.mail.comcast.net ([76.96.62.60]) + by qmta12.westchester.pa.mail.comcast.net with comcast + id ntWi1n0061HzFnQ5Cx1B8k; Wed, 09 Apr 2014 21:01:11 +0000 +Received: from odin.tremily.us ([24.18.63.50]) + by omta14.westchester.pa.mail.comcast.net with comcast + id nx191n00K152l3L3ax1Ask; Wed, 09 Apr 2014 21:01:11 +0000 +Received: by odin.tremily.us (Postfix, from userid 1000) + id 0A2BC1144166; Wed, 9 Apr 2014 14:01:08 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; + t=1397077269; bh=f8+nQx2bPLs8AUXHYdGNHNUlx6x+cCIZYClO6ARffco=; + h=Date:From:To:Cc:Subject:References:In-Reply-To; + b=jl5sBhW0skAY1dhRXaZLuslnMpPciSy0/uim4tbTF1ZUoM1xfDsYvgIPqmCrAeRKf + mfsKHqeZyc4euoZvq9SN3sensRtDheAAaW7ZfvupYEqjJTjUa+sv9eSTrMjAb+Mhsa + adIYYtLmutT4U/9Ljuq3yXV1hrSWdBE6z5BTaPbs= +Date: Wed, 9 Apr 2014 14:01:08 -0700 +From: "W. Trevor King" +To: David Bremner +Subject: Re: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream} + changes +Message-ID: <20140409210108.GB21805@odin.tremily.us> +References: <878urg849d.fsf@zancas.localnet> + <151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us> + <871tx67nnx.fsf@zancas.localnet> +MIME-Version: 1.0 +Content-Type: multipart/signed; micalg=pgp-sha1; + protocol="application/pgp-signature"; boundary="/WwmFnJnmDyWGHa4" +Content-Disposition: inline +In-Reply-To: <871tx67nnx.fsf@zancas.localnet> +OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8; + url=http://tremily.us/pubkey.txt +User-Agent: Mutt/1.5.22 (2013-10-16) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; + s=q20140121; t=1397077271; + bh=06bl5L1ciZ9nBPB1MRxtK4P7VNOCpdLg36yNOASXzgU=; + h=Received:Received:Received:Date:From:To:Subject:Message-ID: + MIME-Version:Content-Type; + b=DM8QjImy0kEJiPpToSlxTvK4rKwabm75bOrD3btSmKKozgE9Q7sNeGt9/60uPVOcs + pP0rRFdUvN59yWP0lR2aN/GeoAjBiGQoqxb4dgupmI1Z7bUGB6ZExRqXq49isyDtUB + GsnTmekmYqLAqvKBWkWtE3Gn0ZnxDQBE/AokZvdwfwQlXnpbOt5cf7WIDWwie3XE5X + sdk0afeK966hzdtlCCqXZheqmVTLPAcuEN43085UQmXopoDG2xfc3Vi+G09HDiGxny + u/AHDmmg0RbPqgyLgzkbmAOy4Boj0yAR37b1RkNlq0NwswgjlYidE1rEqhsPlEk4YY + ebglx9vsgFQMg== +Cc: notmuch +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, 09 Apr 2014 21:01:18 -0000 + + +--/WwmFnJnmDyWGHa4 +Content-Type: text/plain; charset=utf-8 +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable + +On Wed, Apr 09, 2014 at 08:22:26AM -0300, David Bremner wrote: +> W. Trevor King writes: +>=20 +> > The changes just 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/ +> > --- +> > NEWS | 20 ++++++++++++++++++++ +> > 1 file changed, 20 insertions(+) +> > +> > diff --git a/NEWS b/NEWS +> > index d4f4ea4..e26fa0a 100644 +> > --- a/NEWS +> > +++ b/NEWS +> > @@ -20,6 +20,26 @@ 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 +> > +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 bare `NMBGIT` +> > + repository (usually `~/.nmbug`) to a non-bare repository. The +> > + easiest way to do this is: +>=20 +> That bit about non-bare seems to be untrue/misleading? + +The old repositories were bare [1]: + + git clone --bare http://nmbug.tethera.net/git/nmbug-tags.git $HOME/.nmbug + +the new repositories are not [2]: + + system ('git', 'clone', '--no-checkout', '--separate-git-dir', $NMBGIT, + $repository, $tempwork) =3D=3D 0 + +We need non-bare repositories to have remote-tracking branches +(distinct from local branches) [3], and we need remote-tracking +branches to have working @{upstream}. + +I think that's reasonable support for my claim (and most of it is in +the original c200167 commit message), but maybe not? + +> As a step 0, I guess commit any tag changes to nmbug? +> > + +> > + 1. Push any local commits to a remote repository. +> > + 2. Remove your `NMBGIT` repository (e.g. `mv .nmbug .nmbug.bak`). +> > + 3. Use the new `clone` command to create a fresh clone: +> > + +> > + nmbug clone nmbug@nmbug.tethera.net:nmbug-tags +> > + +>=20 +> Jani mentioned on IRC that some people might track nmbug in a read only +> way via git:// + +Sure. The current docs suggest HTTP [1], so I'm fine changing this to +the HTTP URL (or the Git URL). I think folks will get the idea +regardless. I can resubmit v2 with this update, or you can just +squash it in if/when this patch lands in master, whatever is easiest. + +> > + 4. If you had local commits in step 1, add a remote for that +> > + repository and fetch them into the new repository. +>=20 +> Is the "remote repository" in step 1 meant to be the central repo? or +> just a backup? + +The backup. If you have nothing to backup, you already got everything +back after cloning the central repo. + +Cheers, +Trevor + +[1]: http://notmuchmail.org/nmbug/ +[2]: http://git.notmuchmail.org/git/notmuch/blob/c20016742681e1ed48c83de326= +39e10507ffa14d:/devel/nmbug/nmbug#l133 +[3]: http://git.kernel.org/cgit/git/git.git/tree/Documentation/git-clone.tx= +t =20 + --bare:: + Make a 'bare' Git repository=E2=80=A6 + Also the branch heads at the remote are copied directly + to corresponding local branch heads, without mapping + them to `refs/remotes/origin/`. When this option is + used, neither remote-tracking branches nor the related + configuration variables are created. + + +--=20 +This email may be signed or encrypted with GnuPG (http://www.gnupg.org). +For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy + +--/WwmFnJnmDyWGHa4 +Content-Type: application/pgp-signature; name="signature.asc" +Content-Description: OpenPGP digital signature + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAEBAgAGBQJTRbUSAAoJEKKfehoaNkbtSHAP/1/ymAREoL5Qzlz8H46toOZk +ci6KmKxeajUZKs4JMl8hwrr/cyBrPPYqCcim6xHPVXrd6puQBmuOBn+W1X7h15Zo +SOZcbISNwWuYV0/jJ5uE7hAV1Qk2waxJ3gTk9/cMgvCjryYjBQuzDw8Va4PccsrD +5G/A6OouKADOnypG/YJ/4WJZJPVpXoKclmKnK6R3PK32rzqtQWJkRq3JrPyXT+/L +ZWAsmHgxDeuMKsB8KdrAUzDNCNVa+WdeKPM9WO0TyK3lYy9qFaaEETOKXXFE22SB +NEF+x6TBzUq5UPqNiKcw1n4tZSeRrqYad2E0/bAiaywNPSUN3M3sps2Zawi5CNUZ +cl/xSyRLw67t0wEDOoiP3Tv5rZa8xR7F3dtQiEfTvV0Os2P9/EZoIKLzxETZVtXh +BaqxB3nr8Dt4IUjQYoMCCnGony5jpGOEMKXfZ2sES/l/DdWMi/FSwmNRGaTNtzaW +VCTun+bg1bw5WXvJLu6WjYkPXyt12yF9Q+ZrjtlmIfG08oIcv+E2Uf8CqGYAbjIq +9dYUFYC4fDSNHo0/PVP8WFSEm0n674u5zMmAMS9ZRZExPCY6W82TW/H4j6whhV9K +K2PUWXmBFse7eRGJPElHMZcBFbbXiNRr0aeEMB1IDt+0FunDSS3gAL67Bs2kW9E6 +IkqfzaeWft3fV3jatLy9 +=KwGQ +-----END PGP SIGNATURE----- + +--/WwmFnJnmDyWGHa4--