From 954f220079a4de64daf91903d9f86001eaf2a056 Mon Sep 17 00:00:00 2001
From: Sven Klemm <sven@timescale.com>
Date: Mon, 20 Jan 2025 16:01:03 +0100
Subject: [PATCH] Determine backport branch based on version not
 update_from_version

This allows switching backport branch without requiring a published
release for the version. This patch also bumps version to 2.19.0-dev
so 2.18.x becomes the new backport target.
---
 scripts/backport.py | 9 +++++----
 version.config      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/backport.py b/scripts/backport.py
index f5f429e999c..49c8f7613cc 100755
--- a/scripts/backport.py
+++ b/scripts/backport.py
@@ -196,10 +196,11 @@ def git_returncode(command):
     ]
 )
 
-previous_version = version_config["update_from_version"]
-previous_version_parts = previous_version.split(".")
-previous_version_parts[-1] = "x"
-backport_target = ".".join(previous_version_parts)
+version = version_config["version"].split("-")
+version_parts = version.split(".")
+version_parts[1] = str(int(version_parts[1]) - 1)
+version_parts[2] = "x"
+backport_target = ".".join(version_parts)
 backported_label = f"backported-{backport_target}"
 
 print(f"Will backport to {backport_target}.")
diff --git a/version.config b/version.config
index 69be6f54f70..f0cedf97f01 100644
--- a/version.config
+++ b/version.config
@@ -1,3 +1,3 @@
-version = 2.18.0-dev
+version = 2.19.0-dev
 update_from_version = 2.17.2
 downgrade_to_version = 2.17.2