Monorepo for Tangled — https://tangled.org

Stacked PR's with JJ don't allow a shared change #216

open
opened by mikeclayton.tngl.sh

I was playing around with JJ and the stacked PR feature where I wanted to see if I could do something where two different PR's share a parent change. For example I have change A, I commit B, then branch off B to both C and D. Pushing from both C and D do create a stack of PRs, but it looks like a new commit is generated for B for both children. So when I merge C's B PR, that's no reflected on D's PR.

I'm not sure if the issue is in how Tangled deals with these PR's, or something todo with how JJ works. I've had plenty of pain with JJ trying to do things I would consider basic in git and things falling over.

I have recreated the situation on https://tangled.org/@mikeclayton.tngl.sh/test2/pulls

@  xszmlszp mike@clayton.tech 2025-09-23 21:30:18 child-2 90c15318
│  child change 2
│ ○  lxvpzpmx mike@clayton.tech 2025-09-23 21:29:52 child-1 push-lxvpzpmxxqnw 96dc050c
├─╯  child change 1
○  uknpqnoq mike@clayton.tech 2025-09-23 21:29:32 7779427e
│  parent change

I've updated my config.toml like suggested in https://blog.tangled.org/stacking and I'm using JJ 0.33.0.

yes this is correct. we currently cannot detect if a change-id was merged into the default branch. we are generally unable to tell if a commit has landed on master because we use git-am to apply a PR internally, and this generates a new commit SHA. @boltless.me has a proposal for PRs to allow dependent stacks such that merging B would reflect on both C and D, so this might improve in the near future.

Makes sense, want me to close it or do you think it's usefull info for that proposal?

i think it is fine to keep this ticket open!

sign up or login to add to the discussion
Labels

None yet.

area
appview
assignee

None yet.

Participants 2
AT URI
at://did:plc:ufgdpugs72xribnbu66ux5qt/sh.tangled.repo.issue/3lzjriczd2222