From c7c194394c2430ab1c1411e6d4df9a3a90c27390 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 16 Apr 2014 14:03:56 +1700 Subject: [PATCH] [PATCH v2] NEWS: Document the recent 'nmbug clone' and @{upstream} changes --- 9b/1c3eb0ff60521eab3b60d1ddb77d8cfd8fdf4c | 132 ++++++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 9b/1c3eb0ff60521eab3b60d1ddb77d8cfd8fdf4c diff --git a/9b/1c3eb0ff60521eab3b60d1ddb77d8cfd8fdf4c b/9b/1c3eb0ff60521eab3b60d1ddb77d8cfd8fdf4c new file mode 100644 index 000000000..b6ec41770 --- /dev/null +++ b/9b/1c3eb0ff60521eab3b60d1ddb77d8cfd8fdf4c @@ -0,0 +1,132 @@ +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 185A9431FBF + for ; Tue, 15 Apr 2014 14:04:31 -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=[DKIM_SIGNED=0.1, DKIM_VALID=-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 z9T+3bBl3qmo for ; + Tue, 15 Apr 2014 14:04:23 -0700 (PDT) +Received: from qmta03.westchester.pa.mail.comcast.net + (qmta03.westchester.pa.mail.comcast.net [76.96.62.32]) + by olra.theworths.org (Postfix) with ESMTP id 35946431FBD + for ; Tue, 15 Apr 2014 14:04:23 -0700 (PDT) +Received: from omta17.westchester.pa.mail.comcast.net ([76.96.62.89]) + by qmta03.westchester.pa.mail.comcast.net with comcast + id qEmz1n0031vXlb853M4Ng0; Tue, 15 Apr 2014 21:04:22 +0000 +Received: from odin.tremily.us ([24.18.63.50]) + by omta17.westchester.pa.mail.comcast.net with comcast + id qM4M1n00A152l3L3dM4MaM; Tue, 15 Apr 2014 21:04:22 +0000 +Received: from mjolnir.tremily.us (unknown [192.168.0.140]) + by odin.tremily.us (Postfix) with ESMTPS id C2F411148955; + Tue, 15 Apr 2014 14:04:20 -0700 (PDT) +Received: (nullmailer pid 12690 invoked by uid 1000); + Tue, 15 Apr 2014 21:04:02 -0000 +From: "W. Trevor King" +To: notmuch@notmuchmail.org +Subject: [PATCH v2] NEWS: Document the recent 'nmbug clone' and @{upstream} + changes +Date: Tue, 15 Apr 2014 14:03:56 -0700 +Message-Id: + <51bb7db1cd7cc43f00c9c5cdab9c01450058fcf7.1397595340.git.wking@tremily.us> +X-Mailer: git-send-email 1.9.1.353.gc66d89d +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; + s=q20140121; t=1397595862; + bh=GRpNFnvXfZp+Hs5Qfr8gx2/WPLCWjR/J6fjhmPcib2A=; + h=Received:Received:Received:Received:From:To:Subject:Date: + Message-Id:MIME-Version:Content-Type; + b=sLZJzTJUMP7LLU2+RQWeHSugvxjA5oXoYdtv8YeALXXzaN9xJwEWyvEd14jeUFCxk + KTgXeLIsiiSdOmgnDxsBIVQWTAOZhzPTwqdES7Tur7EbQuMbHbC4O0YQjCQjR2bdlf + TEYgKcq6RWUiTpEmXyx5XQoc4CJH+pA5aZAip3aSyvPY+AmhalyFIZ28slkxV/sUmv + Lnf7P+vvn8uSjWbKWMBiehr8Gm7BPvAQLxKd2b+ZZ2YLzrXitNaVmZc2Lw5pLJBkLt + yCih1wr7R8nQiywoSIpXHV5nn9SixjfReZbc4C2Y9mEBGFaHNV50StIxa36UzUxbm7 + bozz2vs8zsX9A== +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: Tue, 15 Apr 2014 21:04:31 -0000 + +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/ +--- +Changes since v1 [1]: + +* Use HTTP (instead of the Git protocol) for the remote URL [2]. +* Remove “bare” 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@tremily.us + http://thread.gmane.org/gmane.mail.notmuch.general/17457/focus=17812 +[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. + ++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) + ========================= + +-- +1.9.1.353.gc66d89d + -- 2.26.2