From 5a9db944d01e1bb78dbc8264ff96f9474fc9af53 Mon Sep 17 00:00:00 2001
From: Anton Bachin <antonbachin@yahoo.com>
Date: Sat, 6 Feb 2021 11:29:34 +0300
Subject: [PATCH] Bump to 2.6.0 and write changelog

Part of #357.
---
 bisect_ppx.opam |  2 +-
 doc/CHANGES     | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 package.json    |  2 +-
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/bisect_ppx.opam b/bisect_ppx.opam
index 3d5abfa9..0ca34ca2 100644
--- a/bisect_ppx.opam
+++ b/bisect_ppx.opam
@@ -1,7 +1,7 @@
 opam-version: "2.0"
 
 synopsis: "Code coverage for OCaml"
-version: "2.5.0"
+version: "2.6.0"
 license: "MIT"
 homepage: "https://github.com/aantron/bisect_ppx"
 doc: "https://github.com/aantron/bisect_ppx"
diff --git a/doc/CHANGES b/doc/CHANGES
index a6ba9e9c..98e6db2b 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,49 @@
+Version 2.6.0 (2021-02-06):
+---------------------------
+
+  Changes
+
+  - Port to ppxlib (#327, Sonja Heinze).
+  - CSS: use ligature fonts, if installed (#339).
+  - Internal: switch to Dune cram tests, finding lots of bugs in the process
+    (beb80b3, 593a7c2, #352).
+
+  Bugs fixed
+
+  - Workaround for typing issue with instrumentation of or-patterns under GADTs;
+    includes a new match instrumenter (#325, reported by Mehdi Bouaziz).
+  - The second subexpression of (||) and (&&) is in tail position iff the whole
+    expression is in tail position; Bisect was unconditionally wrapping the
+    second expression in successor code (#359, reported by Benjamin Monate).
+  - HTML: words that have an instrumentation point on one of their characters
+    were not searchable (#346).
+  - Don't clobber the global random number generator (#344).
+  - (or) nested inside (||) not properly instrumented (#347).
+  - Subexpressions of Pexp_newtype were always treated as if they were in tail
+    position (#348).
+  - assert instrumentation was placed at the wrong point in the generated code
+    (#349).
+  - assert false should not be instrumented; the point is unreachable (#355).
+  - Instrumentation of or-patterns inside local open patterns could trigger
+    unused open warning (#350).
+
+  Removed
+
+  These removals were planned and announced in the 2.0.0 release.
+
+  - PPX option --mode (#200).
+  - PPX option --no-comment-parsing (#202).
+  - PPX option --exclude (#244).
+  - PPX option --exclude-file, which has been renamed to --exclusions (#245).
+  - Reporter options --html, --text, --coveralls, which have been replaced by
+    html, summary, send-to subcommands, respectively (#145).
+  - Support for discovering .out files. Bisect switched to extension .coverage
+    in 2.0.0 (#110).
+  - --dump, --csv, and the old-style text report (#251).
+  - The old command line, including single-dashed (-) multi-character options,
+    and usage of bisect-ppx-report without a subcommand (such as
+    bisect-ppx-report html) (#145).
+
 Version 2.5.0 (2020-10-19):
 ---------------------------
   Additions
diff --git a/package.json b/package.json
index eaaa6f99..b537a3ae 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bisect_ppx",
   "description": "Code coverage for OCaml and Reason",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "license": "MIT",
   "homepage": "https://github.com/aantron/bisect_ppx",
   "bugs": {