From 87faeb129ec4f2cabb044a9f173e810ced8fd498 Mon Sep 17 00:00:00 2001
From: oppiliappan <me@oppi.li>
Date: Tue, 3 Jun 2025 17:10:21 +0100
Subject: [PATCH] noodle on blog post a little more

Signed-off-by: oppiliappan <me@oppi.li>
---
 pages/blog/stacking.md | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pages/blog/stacking.md b/pages/blog/stacking.md
index fdb2d29..248e711 100644
--- a/pages/blog/stacking.md
+++ b/pages/blog/stacking.md
@@ -3,7 +3,7 @@ atroot: true
 template:
 slug: stacking
 title: jujutsu-style code review
-subtitle: we now support jujutsu style "interdiff" code-review!
+subtitle: tangled now supports jujutsu change-ids!
 date: 2025-06-02
 image: /static/img/hidden-ref.png
 authors:
@@ -49,7 +49,7 @@ Consider a hypothetical PR that adds 3 commits:
 [a] some small refactor
 ```
 
-And when only *newly added commits* are easy to review, this
+And when only newly added commits are easy to review, this
 is what ends up happening:
 
 ```
@@ -86,15 +86,16 @@ there is an implicit relation between each change:
 This has the downside of clobbering the output of `git
 blame` (if there is a bug in the new feature, you will first
 land on `e`, and upon digging further, you will land on
-`b`).
+`b`). This becomes incredibly tricky to navigate if reviews
+go on through multiple cycles.
 
 
 ## the interdiff model
 
 With jujutsu however, you have the tools at hand to
 fearlessly edit, split, squash and rework old commits (you
-could do this with git if you are familiar with fixup
-commits or interactive rebasing).
+can absolutely achieve this with git and interactive
+rebasing, but it is certainly not trivial).
 
 Let's try that again:
 
@@ -206,7 +207,7 @@ This submits each change as an individual pull request:
   <a href="static/img/top_of_stack.jpeg">
     <img class="my-1 h-auto max-w-full" src="static/img/top_of_stack.jpeg">
   </a>
-  <figcaption class="text-center">The "stack" attachment is similar to Gerrit's relation chain</figcaption>
+  <figcaption class="text-center">The "stack" is similar to Gerrit's relation chain</figcaption>
 </figure>
 
 After a while, I receive a couple of review comments, but
@@ -272,13 +273,6 @@ Next, let us address the bug:
 $ jj edit so
 
 # hack, hack, hack
-
-$ jj log
-@  so set: introduce set difference push-soqmukrvport*
-├  sq set: introduce set intersection
-├  mk set: introduce set union
-├  my set: introduce basic set operations
-~
 ```
 
 We are done addressing reviews, let us push our code:
@@ -288,7 +282,9 @@ Changes to push to origin:
   Move sideways bookmark push-soqmukrvport from fc06362295bd to dfe2750f6d40
 ```
 
-Upon resubmitting the PR for review:
+Upon resubmitting the PR for review, Tangled is able to
+accurately map every change in the resubmitted branch to its
+original PR, using jujutsu change-ids:
 
 <div class="flex justify-center items-start gap-2">
   <figure class="w-1/2 m-0 flex flex-col items-center">
-- 
2.51.2