From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 27 Apr 2019 21:18:08 +0000 (-0400)
Subject: - initial 1.4 setup
X-Git-Tag: rel_1_4_0b1~897
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fbc5967660f858e4990f99aabad3a69fbc1efae;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- initial 1.4 setup

Fixes: #4631
Change-Id: I7ff2ae98be6db571c9dacc75e912488b8a9bbdbb
---

diff --git a/doc/build/changelog/changelog_14.rst b/doc/build/changelog/changelog_14.rst
new file mode 100644
index 0000000000..f1358c1ade
--- /dev/null
+++ b/doc/build/changelog/changelog_14.rst
@@ -0,0 +1,13 @@
+=============
+1.4 Changelog
+=============
+
+.. changelog_imports::
+
+    .. include:: changelog_13.rst
+        :start-line: 5
+
+
+.. changelog::
+    :version: 1.4.0b1
+    :include_notes_from: unreleased_14
diff --git a/doc/build/changelog/migration_14.rst b/doc/build/changelog/migration_14.rst
new file mode 100644
index 0000000000..3b92d9308e
--- /dev/null
+++ b/doc/build/changelog/migration_14.rst
@@ -0,0 +1,8 @@
+=============================
+What's New in SQLAlchemy 1.4?
+=============================
+
+.. admonition:: About this Document
+
+    This document describes changes between SQLAlchemy version 1.3
+    and SQLAlchemy version 1.4.
diff --git a/doc/build/changelog/unreleased_14/README.txt b/doc/build/changelog/unreleased_14/README.txt
new file mode 100644
index 0000000000..1d2b3446e4
--- /dev/null
+++ b/doc/build/changelog/unreleased_14/README.txt
@@ -0,0 +1,12 @@
+Individual per-changelog files go here
+in .rst format, which are pulled in by
+changelog (version 0.4.0 or higher) to
+be rendered into the changelog_xx.rst file.
+At release time, the files here are removed and written
+directly into the changelog.
+
+Rationale is so that multiple changes being merged
+into gerrit don't produce conflicts.   Note that
+gerrit does not support custom merge handlers unlike
+git itself.
+