--- /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 147BF431FD8\r
+ for <notmuch@notmuchmail.org>; Mon, 25 Aug 2014 10:26:29 -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 sw4ui1e52Aiv for <notmuch@notmuchmail.org>;\r
+ Mon, 25 Aug 2014 10:26:23 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (dmz-mailsec-scanner-7.mit.edu\r
+ [18.7.68.36])\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 9B14D431FB6\r
+ for <notmuch@notmuchmail.org>; Mon, 25 Aug 2014 10:26:17 -0700 (PDT)\r
+X-AuditID: 12074424-f79346d000004923-19-53fb71b73339\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-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id C3.99.18723.7B17BF35; Mon, 25 Aug 2014 13:26:15 -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 s7PHQEW0007795; \r
+ Mon, 25 Aug 2014 13:26:14 -0400\r
+Received: from drake.dyndns.org (31-35-14.wireless.csail.mit.edu\r
+ [128.31.35.14]) (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 s7PHQB9M029605\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Mon, 25 Aug 2014 13:26:13 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1XLy1z-0003jJ-SB; Mon, 25 Aug 2014 13:26:11 -0400\r
+From: Austin Clements <amdragon@mit.edu>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 01/11] new: Don't report version after upgrade\r
+Date: Mon, 25 Aug 2014 13:25:59 -0400\r
+Message-Id: <1408987569-14146-2-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.0.0\r
+In-Reply-To: <1408987569-14146-1-git-send-email-amdragon@mit.edu>\r
+References: <1408987569-14146-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrOIsWRmVeSWpSXmKPExsUixCmqrLu98HewwaFNUhY3WrsZLZqmO1tc\r
+ vzmT2YHZ49b91+wez1bdYvbYcug9cwBzFJdNSmpOZllqkb5dAlfGo7N/mQs281Zc6p/F2sD4\r
+ gauLkZNDQsBE4tWp/SwQtpjEhXvr2boYuTiEBGYzSTROvscO4WxklNh4rg/KOcYk8fDoexYI\r
+ Zy6jxMFdfWwg/WwCGhK/by1mArFFBKQldt6dzQpiMwt4SSy70A9mCws4Suw/uRKshkVAVeJ5\r
+ 10+wOK+Ag8SxDz+g7pCTaLjxCWwmJ1D99IWzweqFgGq+Xz7PPIGRfwEjwypG2ZTcKt3cxMyc\r
+ 4tRk3eLkxLy81CJdc73czBK91JTSTYyg8GJ3UdnB2HxI6RCjAAejEg/vjfjfwUKsiWXFlbmH\r
+ GCU5mJREeaflA4X4kvJTKjMSizPii0pzUosPMUpwMCuJ8DaD5HhTEiurUovyYVLSHCxK4rxv\r
+ ra2ChQTSE0tSs1NTC1KLYLIyHBxKErz3C4AaBYtS01Mr0jJzShDSTBycIMN5gIbHg9TwFhck\r
+ 5hZnpkPkTzEqSonz/gdJCIAkMkrz4Hph8f+KURzoFWHeoyBVPMDUAdf9CmgwE9Bg056fIINL\r
+ EhFSUg2MFYxz9una3T/VceOE/b0fpjvfB4s1hHS8WJf78HnNxXNmG51Xh3D2/O+qLHFkT6vt\r
+ CloT7HmcJelhlkzU/R6H+0UbpvtMrNq6ML/LXN+6xKj7Z9qaWR+iD9zO1Oztvxjyh2GlWuC7\r
+ 5ImPjr5celFOeZZ6105bSaNuxidrSiITNt+OcLHu+ySmxFKckWioxVxUnAgAmBvsW9oCAAA=\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: Mon, 25 Aug 2014 17:26:29 -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 5691005..ddf42c1 100644\r
+--- a/notmuch-new.c\r
++++ b/notmuch-new.c\r
+@@ -1031,8 +1031,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])\r
+ return EXIT_FAILURE;\r
+ }\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