From 1d49b8cc52042b83d7c5a6ad814d98803409d859 Mon Sep 17 00:00:00 2001
From: Pierre Sassoulas <pierre.sassoulas@gmail.com>
Date: Fri, 6 Jan 2023 21:21:03 +0100
Subject: [PATCH] Bump astroid to 2.13.0, update changelog

---
 ChangeLog              | 14 +++++++++++++-
 astroid/__pkginfo__.py |  2 +-
 doc/release.md         | 21 ++++++++++++++-------
 tbump.toml             |  2 +-
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 451c64575d..d224d61e39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,10 +2,22 @@
 astroid's ChangeLog
 ===================
 
-What's New in astroid 2.13.0?
+What's New in astroid 2.14.0?
+=============================
+Release date: TBA
+
+
+
+What's New in astroid 2.13.1?
 =============================
 Release date: TBA
 
+
+
+What's New in astroid 2.13.0?
+=============================
+Release date: 2023-01-07
+
 * Fixed importing of modules that have the same name as the file that is importing.
   ``astroid`` will now correctly handle an ``import math`` statement in a file called ``math.py``
   by relying on the import system.
diff --git a/astroid/__pkginfo__.py b/astroid/__pkginfo__.py
index 00d2659deb..3c4dd2c75c 100644
--- a/astroid/__pkginfo__.py
+++ b/astroid/__pkginfo__.py
@@ -2,5 +2,5 @@
 # For details: https://github.com/PyCQA/astroid/blob/main/LICENSE
 # Copyright (c) https://github.com/PyCQA/astroid/blob/main/CONTRIBUTORS.txt
 
-__version__ = "2.13.0-dev0"
+__version__ = "2.13.0"
 version = __version__
diff --git a/doc/release.md b/doc/release.md
index d9bc628c46..83cc55d2d6 100644
--- a/doc/release.md
+++ b/doc/release.md
@@ -44,13 +44,20 @@ Check the commit and then push to a release branch
 
 ## Backporting a fix from `main` to the maintenance branch
 
-Whenever a commit on `main` should be released in a patch release on the current
-maintenance branch we cherry-pick the commit from `main`.
-
-- During the merge request on `main`, make sure that the changelog is for the patch
-  version `X.Y-1.Z'`. (For example: `v2.3.5`)
-- After the PR is merged on `main` cherry-pick the commits on the `maintenance/X.Y.x`
-  branch (For example: from `maintenance/2.4.x` cherry-pick a commit from `main`)
+Whenever a PR on `main` should be released in a patch release on the current maintenance
+branch:
+
+- Label the PR with `backport maintenance/X.Y-1.x`. (For example
+  `backport maintenance/2.3.x`)
+- Squash the PR before merging (alternatively rebase if there's a single commit)
+- (If the automated cherry-pick has conflicts)
+  - Add a `Needs backport` label and do it manually.
+  - You might alternatively also:
+    - Cherry-pick the changes that create the conflict if it's not a new feature before
+      doing the original PR cherry-pick manually.
+    - Decide to wait for the next minor to release the PR
+    - In any case upgrade the milestones in the original PR and newly cherry-picked PR
+      to match reality.
 - Release a patch version
 
 ## Releasing a patch version
diff --git a/tbump.toml b/tbump.toml
index eb36204f5b..fc2439b4b5 100644
--- a/tbump.toml
+++ b/tbump.toml
@@ -1,7 +1,7 @@
 github_url = "https://github.com/PyCQA/astroid"
 
 [version]
-current = "2.13.0-dev0"
+current = "2.13.0"
 regex = '''
 ^(?P<major>0|[1-9]\d*)
 \.