From 408b188ea525c4c689a08ea50973741e87a9abaf Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 9 Apr 2014 08:57:38 +1700 Subject: [PATCH] [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream} changes --- a9/207270ab507bad69ea536a7684ad9e32a03861 | 113 ++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 a9/207270ab507bad69ea536a7684ad9e32a03861 diff --git a/a9/207270ab507bad69ea536a7684ad9e32a03861 b/a9/207270ab507bad69ea536a7684ad9e32a03861 new file mode 100644 index 000000000..6878b8cbb --- /dev/null +++ b/a9/207270ab507bad69ea536a7684ad9e32a03861 @@ -0,0 +1,113 @@ +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 96881431FC0 + for ; Tue, 8 Apr 2014 08:58:07 -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 cLPNPetPljsP for ; + Tue, 8 Apr 2014 08:58:00 -0700 (PDT) +Received: from qmta01.westchester.pa.mail.comcast.net + (qmta01.westchester.pa.mail.comcast.net [76.96.62.16]) + by olra.theworths.org (Postfix) with ESMTP id 0DE77431FBC + for ; Tue, 8 Apr 2014 08:57:59 -0700 (PDT) +Received: from omta12.westchester.pa.mail.comcast.net ([76.96.62.44]) + by qmta01.westchester.pa.mail.comcast.net with comcast + id nQNs1n0060xGWP851TxzZD; Tue, 08 Apr 2014 15:57:59 +0000 +Received: from odin.tremily.us ([24.18.63.50]) + by omta12.westchester.pa.mail.comcast.net with comcast + id nTxx1n00b152l3L3YTxyPX; Tue, 08 Apr 2014 15:57:59 +0000 +Received: from mjolnir.tremily.us (unknown [192.168.0.140]) + by odin.tremily.us (Postfix) with ESMTPS id 3BB3D110D802; + Tue, 8 Apr 2014 08:57:57 -0700 (PDT) +Received: (nullmailer pid 3821 invoked by uid 1000); + Tue, 08 Apr 2014 15:57:44 -0000 +From: "W. Trevor King" +To: notmuch +Subject: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream} + changes +Date: Tue, 8 Apr 2014 08:57:38 -0700 +Message-Id: + <151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us> +X-Mailer: git-send-email 1.9.1.353.gc66d89d +In-Reply-To: <878urg849d.fsf@zancas.localnet> +References: <878urg849d.fsf@zancas.localnet> +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; + s=q20140121; t=1396972679; + bh=4FKvNSHLX/a5pU3rXZZnMhI+ZNAS4fj66i2kfOxeSCI=; + h=Received:Received:Received:Received:From:To:Subject:Date: + Message-Id; + b=eGAnrbhjO2IfomqSFug/648x+opFe5LNDd6FweV4ogD/4hZLVGSDpoOK9rBloMWfk + 1h6ebxMwoJUPQ1Hq6utE0Hd78UKc3jdcv+ICZrPLw7Ubxk0b2T6oLjpJ8lX0j4ExE8 + 3unfRV9hLFCXiaI059Q7CKpncUhIuhZt8lnJKGbW2dR0GaD1jL8O9ZLmHo0cNOidX5 + oN0QZam31MjCKHaxv7D1Zb0oNel3o+PAwEPCyVd4Kc023UA5C2Mxwshmr6d/vtqxeJ + HZtodcsJxFSprV6kuYiu08Ut+kQm9erhL+WXnkIAsw5G1J2CgRgNXdG3OcNhiJuuhR + AQnjMlnWkYhBg== +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, 08 Apr 2014 15:58:07 -0000 + +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: ++ ++ 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 ++ ++ 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