1a/30b27cbdc126ca94773691c550614e295b2776

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 147BF431FD8\r
   6         for <notmuch@notmuchmail.org>; Mon, 25 Aug 2014 10:26:29 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -2.3\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id sw4ui1e52Aiv for <notmuch@notmuchmail.org>;\r
  16         Mon, 25 Aug 2014 10:26:23 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-7.mit.edu (dmz-mailsec-scanner-7.mit.edu\r
  18         [18.7.68.36])\r
  19         (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 9B14D431FB6\r
  22         for <notmuch@notmuchmail.org>; Mon, 25 Aug 2014 10:26:17 -0700 (PDT)\r
  23 X-AuditID: 12074424-f79346d000004923-19-53fb71b73339\r
  24 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  25         (using TLS with cipher AES256-SHA (256/256 bits))\r
  26         (Client did not present a certificate)\r
  27         by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
  28         id C3.99.18723.7B17BF35; Mon, 25 Aug 2014 13:26:15 -0400 (EDT)\r
  29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  30         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id s7PHQEW0007795; \r
  31         Mon, 25 Aug 2014 13:26:14 -0400\r
  32 Received: from drake.dyndns.org (31-35-14.wireless.csail.mit.edu\r
  33         [128.31.35.14]) (authenticated bits=0)\r
  34         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  35         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s7PHQB9M029605\r
  36         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  37         Mon, 25 Aug 2014 13:26:13 -0400\r
  38 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  39         (envelope-from <amdragon@mit.edu>)\r
  40         id 1XLy1z-0003jJ-SB; Mon, 25 Aug 2014 13:26:11 -0400\r
  41 From: Austin Clements <amdragon@mit.edu>\r
  42 To: notmuch@notmuchmail.org\r
  43 Subject: [PATCH v4 01/11] new: Don't report version after upgrade\r
  44 Date: Mon, 25 Aug 2014 13:25:59 -0400\r
  45 Message-Id: <1408987569-14146-2-git-send-email-amdragon@mit.edu>\r
  46 X-Mailer: git-send-email 2.0.0\r
  47 In-Reply-To: <1408987569-14146-1-git-send-email-amdragon@mit.edu>\r
  48 References: <1408987569-14146-1-git-send-email-amdragon@mit.edu>\r
  49 X-Brightmail-Tracker:\r
  50  H4sIAAAAAAAAA+NgFjrOIsWRmVeSWpSXmKPExsUixCmqrLu98HewwaFNUhY3WrsZLZqmO1tc\r
  51         vzmT2YHZ49b91+wez1bdYvbYcug9cwBzFJdNSmpOZllqkb5dAlfGo7N/mQs281Zc6p/F2sD4\r
  52         gauLkZNDQsBE4tWp/SwQtpjEhXvr2boYuTiEBGYzSTROvscO4WxklNh4rg/KOcYk8fDoexYI\r
  53         Zy6jxMFdfWwg/WwCGhK/by1mArFFBKQldt6dzQpiMwt4SSy70A9mCws4Suw/uRKshkVAVeJ5\r
  54         10+wOK+Ag8SxDz+g7pCTaLjxCWwmJ1D99IWzweqFgGq+Xz7PPIGRfwEjwypG2ZTcKt3cxMyc\r
  55         4tRk3eLkxLy81CJdc73czBK91JTSTYyg8GJ3UdnB2HxI6RCjAAejEg/vjfjfwUKsiWXFlbmH\r
  56         GCU5mJREeaflA4X4kvJTKjMSizPii0pzUosPMUpwMCuJ8DaD5HhTEiurUovyYVLSHCxK4rxv\r
  57         ra2ChQTSE0tSs1NTC1KLYLIyHBxKErz3C4AaBYtS01Mr0jJzShDSTBycIMN5gIbHg9TwFhck\r
  58         5hZnpkPkTzEqSonz/gdJCIAkMkrz4Hph8f+KURzoFWHeoyBVPMDUAdf9CmgwE9Bg056fIINL\r
  59         EhFSUg2MFYxz9una3T/VceOE/b0fpjvfB4s1hHS8WJf78HnNxXNmG51Xh3D2/O+qLHFkT6vt\r
  60         CloT7HmcJelhlkzU/R6H+0UbpvtMrNq6ML/LXN+6xKj7Z9qaWR+iD9zO1Oztvxjyh2GlWuC7\r
  61         5ImPjr5celFOeZZ6105bSaNuxidrSiITNt+OcLHu+ySmxFKckWioxVxUnAgAmBvsW9oCAAA=\r
  62 X-BeenThere: notmuch@notmuchmail.org\r
  63 X-Mailman-Version: 2.1.13\r
  64 Precedence: list\r
  65 List-Id: "Use and development of the notmuch mail system."\r
  66         <notmuch.notmuchmail.org>\r
  67 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  69 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  70 List-Post: <mailto:notmuch@notmuchmail.org>\r
  71 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  72 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  73         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  74 X-List-Received-Date: Mon, 25 Aug 2014 17:26:29 -0000\r
  75 \r
  76 The version number has always been pretty meaningless to the user and\r
  77 it's about to become even more meaningless with the introduction of\r
  78 "features".  Hopefully, the database will remain on version 3 for some\r
  79 time to come; however, the introduction of new features over time in\r
  80 version 3 will necessitate upgrades within version 3.  It would be\r
  81 confusing if we always tell the user they've been "upgraded to version\r
  82 3".  If the user wants to know what's new, they should read the news.\r
  83 ---\r
  84  notmuch-new.c        | 3 +--\r
  85  test/T530-upgrade.sh | 2 +-\r
  86  2 files changed, 2 insertions(+), 3 deletions(-)\r
  87 \r
  88 diff --git a/notmuch-new.c b/notmuch-new.c\r
  89 index 5691005..ddf42c1 100644\r
  90 --- a/notmuch-new.c\r
  91 +++ b/notmuch-new.c\r
  92 @@ -1031,8 +1031,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])\r
  93                 return EXIT_FAILURE;\r
  94             }\r
  95             if (add_files_state.verbosity >= VERBOSITY_NORMAL)\r
  96 -               printf ("Your notmuch database has now been upgraded to database format version %u.\n",\r
  97 -                   notmuch_database_get_version (notmuch));\r
  98 +               printf ("Your notmuch database has now been upgraded.\n");\r
  99         }\r
 100  \r
 101         add_files_state.total_files = 0;\r
 102 diff --git a/test/T530-upgrade.sh b/test/T530-upgrade.sh\r
 103 index 7d5d5aa..c4c4ac8 100755\r
 104 --- a/test/T530-upgrade.sh\r
 105 +++ b/test/T530-upgrade.sh\r
 106 @@ -33,7 +33,7 @@ test_expect_equal "$output" "\\r
 107  Welcome to a new version of notmuch! Your database will now be upgraded.\r
 108  This process is safe to interrupt.\r
 109  Backing up tags to FILENAME\r
 110 -Your notmuch database has now been upgraded to database format version 2.\r
 111 +Your notmuch database has now been upgraded.\r
 112  No new mail."\r
 113  \r
 114  test_begin_subtest "tag backup matches pre-upgrade dump"\r
 115 -- \r
 116 2.0.0\r
 117 \r