fix: Check for Jujutsu repo at conflict location #462

Merged

wetneb merged 1 commit from senekor-kwlupwtkynpr into main

2025-07-02 16:16:13 +02:00

senekor commented

2025-07-02 16:06:20 +02:00

Member

We warn Jujutsu users when they are using the command solve, because
that likely won't work. This is a problem for contributors who use
Jujutsu. For example, tests of the solve command might fail, because
Jujutsu is detected.

To prevent this, we check if there is a Jujutsu repository at the
location of the conflicted file that was passed to the solve command
(instead of the current working directory). Our tests run in temporary
directories, where no Jujutsu repository will be detected.

We warn Jujutsu users when they are using the command `solve`, because that likely won't work. This is a problem for contributors who use Jujutsu. For example, tests of the `solve` command might fail, because Jujutsu is detected. To prevent this, we check if there is a Jujutsu repository at the location of the conflicted file that was passed to the `solve` command (instead of the current working directory). Our tests run in temporary directories, where no Jujutsu repository will be detected.

👍 1

senekor force-pushed senekor-kwlupwtkynpr from 819cf3ce7b to 2fb867bcb7

2025-07-02 16:07:16 +02:00

Compare