Re: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream} changes

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