From 11b1cee338f041713cb731b0fa26d13ff429f80f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 20 May 2025 01:11:07 +0200
Subject: [PATCH] ljkasdladsljk

---
 justfile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/justfile b/justfile
index ad30c48..9ef135d 100644
--- a/justfile
+++ b/justfile
@@ -484,7 +484,9 @@ bump-here *packages:
     # test -L result && fd . result --type x --color=always | tee update-executables.txt
     # $GIT show --name-only --pretty="" | xe statix fix
     $GIT diff
+    printf "\n"
     printf "delta results-src-{old,new}/%s.src/.\n" "${packages[@]}"
+    printf "\n"
 
 fix *packages:
     #!/usr/bin/env -S bash -euo pipefail
@@ -638,8 +640,9 @@ _mk_worktree $name $dir $base="upstream/master" $onto="":
 pop-commits-to-new-worktree $commits=`cd "$invokedir"; just _some_commits`:
     #!/usr/bin/env -S bash -euo pipefail
     test -n "$commits" || { echo >&2 "no commits were selected!"; false;}
-    # we make a nasty assumption here: the last commit passed in is also the topologically oldest one in the git history
-    # we also assume the revs in the interactive rebase are just as short or longer as those returned by 'just _some_commits'
+    # we make two nasty assumption here:
+    # * the last commit passed in is also the topologically oldest one in the git history
+    # * the revs in the interactive rebase are just as short or longer than those returned by 'just _some_commits'
     type="$(just _a_wt_type)"
     name="$(
         cd "$invokedir";
@@ -856,13 +859,13 @@ test-merge $rev=`cd "$invokedir"; just _a_commit` *branches:
     for branch in "${branches[@]}"; do
         echo >&2 "Checking $branch..."
         if ! $GIT merge-tree "$branch" "$rev" >/dev/null; then
-            echo >&2 "MERGE-CONFLICT with $branch"
+            echo >&2 "❌ MERGE-CONFLICT with $branch"
             retval=1
             [[ -t 1 ]] || break # short circuit if only retcode matters
         fi
     done
     if [[ "$retval" -eq 0 ]]; then
-        echo >&2 "No conflicts!"
+        echo >&2 "✅ No conflicts!"
     fi
     exit "$retval"
 
@@ -983,6 +986,9 @@ _some_systems:
         staging \
         staging-next \
         python-updates \
+        release-25.05 \
+        staging-25.05 \
+        staging-next-25.05 \
         release-24.11 \
         staging-24.11 \
         staging-next-24.11