--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 6650F431FBC\r
+ for <notmuch@notmuchmail.org>; Sat, 26 Jul 2014 20:53:24 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_MED=-2.3] 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 rfQOEFh3JKhu for <notmuch@notmuchmail.org>;\r
+ Sat, 26 Jul 2014 20:53:18 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-6.mit.edu (dmz-mailsec-scanner-6.mit.edu\r
+ [18.7.68.35])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id B2C68431FC7\r
+ for <notmuch@notmuchmail.org>; Sat, 26 Jul 2014 20:53:07 -0700 (PDT)\r
+X-AuditID: 12074423-f79bf6d000007580-df-53d477a053f4\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+ (using TLS with cipher AES256-SHA (256/256 bits))\r
+ (Client did not present a certificate)\r
+ by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 3D.64.30080.0A774D35; Sat, 26 Jul 2014 23:53:04 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+ by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id s6R3r3ba008825; \r
+ Sat, 26 Jul 2014 23:53:04 -0400\r
+Received: from drake.dyndns.org\r
+ (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [216.15.114.40]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s6R3r0wN016394\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 26 Jul 2014 23:53:03 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1XBFW8-00051E-8h; Sat, 26 Jul 2014 23:53:00 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 04/14] new: Don't report version after upgrade\r
+Date: Sat, 26 Jul 2014 23:52:43 -0400\r
+Message-Id: <1406433173-19169-5-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.0.0\r
+In-Reply-To: <1406433173-19169-1-git-send-email-amdragon@mit.edu>\r
+References: <1406433173-19169-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsUixCmqrLug/Eqwwe0vShbXb85kdmD0eLbq\r
+ FnMAYxSXTUpqTmZZapG+XQJXxsYVUgXdfBVfX91gb2Dcxt3FyMkhIWAiMXXvCRYIW0ziwr31\r
+ bF2MXBxCArOZJI5MOM0O4WxklHj89QsrhHOHSWJh00NmCGcuo8S8KZ/A+tkENCS27V/OCGKL\r
+ CEhL7Lw7G6iDg4NZQE3iT5cKiCksYCfx9kI8SAWLgKrE70n9rCA2r4CDxMVrzYwQV8hJNNz4\r
+ xAZicwo4Shx/doINpFUIqObWpcQJjPwLGBlWMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Zrp5WaW\r
+ 6KWmlG5iBAUMu4vyDsY/B5UOMQpwMCrx8GawXQkWYk0sK67MPcQoycGkJMq73wwoxJeUn1KZ\r
+ kVicEV9UmpNafIhRgoNZSYRXqBgox5uSWFmVWpQPk5LmYFES531rbRUsJJCeWJKanZpakFoE\r
+ k5Xh4FCS4J1eBtQoWJSanlqRlplTgpBm4uAEGc4DNHxDKcjw4oLE3OLMdIj8KUZFKXHeXyAJ\r
+ AZBERmkeXC8sol8xigO9IszLCrKCB5gM4LpfAQ1mAhrM4n8ZZHBJIkJKqoFxcn6BgF/b76Rb\r
+ FYbzhVY2tFQXnbA963X3zYNVr2aFcS1TyV5yJtOEaVLYqrkqLqIsvgsMnl86c6bu90GN5olf\r
+ s3ust/iaSSuxSJVpSSU53vwU6Lz/c2pzoeSssMWuu5/I3QpfpKF+YpaHvV3W3lvPF1tw29pe\r
+ 2XKcKUZ++2WGU+qrwjZymk5RYinOSDTUYi4qTgQAK8uwWMMCAAA=\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: Sun, 27 Jul 2014 03:53:24 -0000\r
+\r
+The version number has always been pretty meaningless to the user and\r
+it's about to become even more meaningless with the introduction of\r
+"features". Hopefully, the database will remain on version 3 for some\r
+time to come; however, the introduction of new features over time in\r
+version 3 will necessitate upgrades within version 3. It would be\r
+confusing if we always tell the user they've been "upgraded to version\r
+3". If the user wants to know what's new, they should read the news.\r
+---\r
+ notmuch-new.c | 3 +--\r
+ test/T530-upgrade.sh | 2 +-\r
+ 2 files changed, 2 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/notmuch-new.c b/notmuch-new.c\r
+index d269c7c..b7590a8 100644\r
+--- a/notmuch-new.c\r
++++ b/notmuch-new.c\r
+@@ -1023,8 +1023,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])\r
+ add_files_state.verbosity >= VERBOSITY_NORMAL ? upgrade_print_progress : NULL,\r
+ &add_files_state);\r
+ if (add_files_state.verbosity >= VERBOSITY_NORMAL)\r
+- printf ("Your notmuch database has now been upgraded to database format version %u.\n",\r
+- notmuch_database_get_version (notmuch));\r
++ printf ("Your notmuch database has now been upgraded.\n");\r
+ }\r
+ \r
+ add_files_state.total_files = 0;\r
+diff --git a/test/T530-upgrade.sh b/test/T530-upgrade.sh\r
+index 7d5d5aa..c4c4ac8 100755\r
+--- a/test/T530-upgrade.sh\r
++++ b/test/T530-upgrade.sh\r
+@@ -33,7 +33,7 @@ test_expect_equal "$output" "\\r
+ Welcome to a new version of notmuch! Your database will now be upgraded.\r
+ This process is safe to interrupt.\r
+ Backing up tags to FILENAME\r
+-Your notmuch database has now been upgraded to database format version 2.\r
++Your notmuch database has now been upgraded.\r
+ No new mail."\r
+ \r
+ test_begin_subtest "tag backup matches pre-upgrade dump"\r
+-- \r
+2.0.0\r
+\r
projects / notmuch-archives.git / commitdiff