Summary

Fix computation of parent base in jujutsu with multiple fork points.

Review Request #14853 — Created Feb. 25, 2026 and submitted March 2, 2026, 2:30 p.m.

Information

Owner

david

Repository

RBTools

Branch

release-6.x

Bugs

Depends On

Reviewers

Groups

rbtools

People

Description

It turns out with complex trees of merges, the fork_point() revset can

return multiple results. Since we really only care about the most recent fork

point, we can wrap this in latest() so that it returns a single

revision.

Testing Done

Posted a change where I hadn't rebased my giant dev tree in a while and had
two fork points back to master and saw that it no longer crashed.

Commits

Summary	ID
Fix computation of parent base in jujutsu with multiple fork points. It turns out with complex trees of merges, the `fork_point()` revset can return multiple results. Since we really only care about the most recent fork point, we can wrap this in `latest()` so that it returns a single revision. Testing Done: Posted a change where I hadn't rebased my giant dev tree in a while and had two fork points back to master and saw that it no longer crashed.	wvmskzwnvurswonumxvkysqxmnonuzrk

Summary

Fix computation of parent base in jujutsu with multiple fork points.

It turns out with complex trees of merges, the `fork_point()` revset can return multiple results. Since we really only care about the most recent fork point, we can wrap this in `latest()` so that it returns a single revision. Testing Done: Posted a change where I hadn't rebased my giant dev tree in a while and had two fork points back to master and saw that it no longer crashed.

wvmskzwnvurswonumxvkysqxmnonuzrk

Issues

Description	From	Last Updated
Can we mention in the docstring or a comment that if there are multiple fork points the most recent one …	maubin	Feb. 25, 2026, 10:01 p.m.

flake8 passed.

JSHint passed.

The issue has been resolved. Show all issues

Can we mention in the docstring or a comment that if there are multiple fork points the most recent one will be returned.

Commits:

	Summary	ID
	Fix computation of parent base in jujutsu with multiple fork points. It turns out with complex trees of merges, the `fork_point()` revset can return multiple results. Since we really only care about the most recent fork point, we can wrap this in `latest()` so that it returns a single revision. Testing Done: Posted a change where I hadn't rebased my giant dev tree in a while and had two fork points back to master and saw that it no longer crashed.	wvmskzwnvurswonumxvkysqxmnonuzrk
	Fix computation of parent base in jujutsu with multiple fork points. It turns out with complex trees of merges, the `fork_point()` revset can return multiple results. Since we really only care about the most recent fork point, we can wrap this in `latest()` so that it returns a single revision. Testing Done: Posted a change where I hadn't rebased my giant dev tree in a while and had two fork points back to master and saw that it no longer crashed.	wvmskzwnvurswonumxvkysqxmnonuzrk

Diff:

Revision 2 (+8 -8)

Show changes

rbtools/clients/jujutsu.py

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

Ship it!

```
Ship It!
```

Status:: Completed
Change Summary:: Pushed to release-6.x (42a5446)