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 1DF52431FC0 for ; Wed, 9 Apr 2014 04:22:43 -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 WS5CLnlNEZI0 for ; Wed, 9 Apr 2014 04:22:35 -0700 (PDT) Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 4A940431FBC for ; Wed, 9 Apr 2014 04:22:35 -0700 (PDT) Received: from remotemail by yantan.tethera.net with local (Exim 4.80) (envelope-from ) id 1WXqaM-0000aG-7p; Wed, 09 Apr 2014 08:22:30 -0300 Received: (nullmailer pid 10943 invoked by uid 1000); Wed, 09 Apr 2014 11:22:26 -0000 From: David Bremner To: "W. Trevor King" , notmuch Subject: Re: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream} changes In-Reply-To: <151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us> References: <878urg849d.fsf@zancas.localnet> <151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us> User-Agent: Notmuch/0.17+164~g31fc76b (http://notmuchmail.org) Emacs/24.3.1 (x86_64-pc-linux-gnu) Date: Wed, 09 Apr 2014 08:22:26 -0300 Message-ID: <871tx67nnx.fsf@zancas.localnet> MIME-Version: 1.0 Content-Type: text/plain 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 11:22:43 -0000 "W. Trevor King" writes: > 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. > > +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: That bit about non-bare seems to be untrue/misleading? 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 > + Jani mentioned on IRC that some people might track nmbug in a read only way via git:// > + 4. If you had local commits in step 1, add a remote for that > + repository and fetch them into the new repository. Is the "remote repository" in step 1 meant to be the central repo? or just a backup?