From b11059418a3ba3cc5b286d899809645407186394 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Thu, 10 Apr 2014 19:05:59 +1700 Subject: [PATCH] Re: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream} changes --- 0b/3711736700d7322d9caeb672f76c286f9701ac | 167 ++++++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100644 0b/3711736700d7322d9caeb672f76c286f9701ac diff --git a/0b/3711736700d7322d9caeb672f76c286f9701ac b/0b/3711736700d7322d9caeb672f76c286f9701ac new file mode 100644 index 000000000..899f5347d --- /dev/null +++ b/0b/3711736700d7322d9caeb672f76c286f9701ac @@ -0,0 +1,167 @@ +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 1574A431FBD + for ; Wed, 9 Apr 2014 19:06:14 -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 rwp64mdalp8L for ; + Wed, 9 Apr 2014 19:06:06 -0700 (PDT) +Received: from qmta05.westchester.pa.mail.comcast.net + (qmta05.westchester.pa.mail.comcast.net [76.96.62.48]) + by olra.theworths.org (Postfix) with ESMTP id 2A6B6431FBC + for ; Wed, 9 Apr 2014 19:06:06 -0700 (PDT) +Received: from omta08.westchester.pa.mail.comcast.net ([76.96.62.12]) + by qmta05.westchester.pa.mail.comcast.net with comcast + id o1lD1n0050Fqzac55262eh; Thu, 10 Apr 2014 02:06:02 +0000 +Received: from odin.tremily.us ([24.18.63.50]) + by omta08.westchester.pa.mail.comcast.net with comcast + id o2601n008152l3L3U260Lv; Thu, 10 Apr 2014 02:06:02 +0000 +Received: by odin.tremily.us (Postfix, from userid 1000) + id D6B35114473F; Wed, 9 Apr 2014 19:05:59 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; + t=1397095559; bh=isIEokHw50Kvz0GKwS3OZ/sUql8LKjBySbRJ4dE/mBM=; + h=Date:From:To:Cc:Subject:References:In-Reply-To; + b=YMmy2C7NN+wfCB9C9eKGETikXshAZWYWU5WAAirrfccaSsSUiKOaHQhfgBXNDHHa5 + PX7WTtYjI2GNod4mNhincpvT3518/FIIL5oKMdkXHfIkiO197p7scuQAa57XHvQfyV + eNB3T/yjYGqynsb3F+J2/raUItOQSIxi79NrZluI= +Date: Wed, 9 Apr 2014 19:05:59 -0700 +From: "W. Trevor King" +To: David Bremner +Subject: Re: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream} + changes +Message-ID: <20140410020559.GC21805@odin.tremily.us> +References: <878urg849d.fsf@zancas.localnet> + <151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us> + <871tx67nnx.fsf@zancas.localnet> + <20140409210108.GB21805@odin.tremily.us> + <87sipm576i.fsf@zancas.localnet> +MIME-Version: 1.0 +Content-Type: multipart/signed; micalg=pgp-sha1; + protocol="application/pgp-signature"; boundary="XWOWbaMNXpFDWE00" +Content-Disposition: inline +In-Reply-To: <87sipm576i.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=1397095562; + bh=4W5T0LIZuEj4R3D/xmOZJEMCcPqJ0YBUcPfVEWnfnyc=; + h=Received:Received:Received:Date:From:To:Subject:Message-ID: + MIME-Version:Content-Type; + b=kz8+y97u3cYlZrvlnJ7KEmLFUUlDSf/2jVafUdaCEdcOwY6KsSkuLSHe9ZnDm0Ei5 + AkcX3WzGENYnA8uWnq2dgCN2MZdx9IriIB9xj9P4a3X8430qpql/mPPGSWrYc+vvvQ + kPqyRMd+qu3MPvJN4DuUoBYt2t26b4LTR5Rjh0o3zVSZq0Rxi//OG4GZHzeq8qnIqj + hwZnlnG4Ihwqy+BweVA7uHljubiKqLiqiuoT5gOpl3M/lAgD1TqSpYUlR8nWH+HAv9 + 9YrjFtIsi+A/ccgq1tSsvgJnNIPY5r8VeUxfcR9rrWMZ5yyq+G6MpTj87fxYek9y1r + lWX8/Ukjnn11g== +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: Thu, 10 Apr 2014 02:06:14 -0000 + + +--XWOWbaMNXpFDWE00 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable + +On Wed, Apr 09, 2014 at 10:01:25PM -0300, David Bremner wrote: +> W. Trevor King writes: +>=20 +> > 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}. +>=20 +> OK, I see what you mean, the repository has "bare =3D false". On the +> other hand we immediately blow away the work tree, + +But whenever we do anything that might involve a working directory +(just merging), we create a temporary one and set GIT_WORK_TREE. So +the ~/.nmbug repo is a plain-vanilla, non-bare repo with an ephemeral +working directory. + +> > I think that's reasonable support for my claim (and most of it is in +> > the original c200167 commit message), but maybe not? +>=20 +> In any case, I think I think it's mainly a technicality, and that we +> want to keep the level of detail in the release notes down a bit. +> If you don't like the above mini-patch, then maybe a NOTES section +> in the nmbug docs. + +Sure. I think my previous email was my shot at explaining the +situation ;). If it wasn't clear, maybe someone else could take a +stab at a NOTES blurb. + +> >> 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. +>=20 +> It might be less confusing to explicitly use the word "backup" in +> step 1 then. + +How about: + + 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. + +? + +We can also use the suggested ~/.nmbug.bak from step 2 as the backup +repository in step 4. I chose the current broad-sketch approach for +steps 1 and 4, because I assumed folks with local commits would be +comfortable pushing Git branches around, and didn't want to imply that +I'd covered all the corner cases (e.g. folks with my-funky-tags +branches or other wonky repos). + +Cheers, +Trevor + +--=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 + +--XWOWbaMNXpFDWE00 +Content-Type: application/pgp-signature; name="signature.asc" +Content-Description: OpenPGP digital signature + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAEBAgAGBQJTRfyFAAoJEKKfehoaNkbtDfUQAKbOeUk+VamOoOt4BnIQWoGJ +8Sz32gRPlKE2p+3VnEEsh9NADUsyzO1Iq2snVqg9eyq9KBlMciL5wStEhnzrQFdj +5j+joJSlav9tkRFhVmhKvVGzRDMaVUBwD90LU13n8QUxjXnrBDOQzajVlKp6XPof +yHyZOsOSisW+RoeJvAkDDJ4ykeOsLChnivFN4gkMjkqFMAs4Az0p+eGI5hA1u5A+ +ITdzkeD5odf4LBNE3dCsqBjosfCa+1gE5nUwxylu/AiRuAjB+t+ouMZadAYqqZuD +lbLbS9upJx9+pc/W//ovr5IB5fDpCZ6qSqx7qYcSy071u5MCswv6eHDFNa38LlI+ +vLUqQIm6QHNtqGux55eL6w2wAG0hNCmPv4pxM4PNbb4QWYHZYyoIGu5AMxVn1haH +5kXZCQhu73i7XhyDRT3mxsCCTWnNft3SheXVmeBCsyiLIcI4PBUai6vK/GSqpT2F +uiOceYSFGKOsuaNK7pxY3pQQSOxMewJUzqY+6Ptmrb6lKG1azxjE1o+fGladAynz +oQKMb42aVWGDVhT7jRxRg8UVIA2AE45gO/R36Jg9ctdw/j2dK9v0k2qF6rzOljr1 +g1IOCZZZtbVRJOh4uDg45bBN9aCfPvW1qKv7KoGEcbRPi+P2EjEkS21yEAnO04oa +5CdOvb+W0dGb6Pb4uNG0 +=nEiu +-----END PGP SIGNATURE----- + +--XWOWbaMNXpFDWE00-- -- 2.26.2