martinvonz / jj

A Git-compatible VCS that is both simple and powerful
https://martinvonz.github.io/jj/
Apache License 2.0
7.24k stars 240 forks source link

lib id_prefix: look for divergent changes outside short prefix set #3989

Closed ilyagr closed 3 days ago

ilyagr commented 3 days ago

Fixes https://github.com/martinvonz/jj/issues/2476.

Previously, if there was a change id match within the short prefix lookup set, jj would not look for commits with that same change id outside the short prefix set. So, it wouldn't find the conflicted commits for a commit with a divergent (AKA conflicted) change id.

Checklist

If applicable:

ilyagr commented 3 days ago

Thank you, Yuya!