[Bug] GUI stops refreshing after manual refresh while merge tool is open

[Doodeletion]

There's some weird behavior when merging.

I created a conflict in text file called 'test'.

When merging this is the resulting 'Changes' view, with 'test' conflicted in unstaged and also without conflict in staged. The staged version shows "No changes or only EOL changes" when selected. It also cannot be opened in the external merge tool using the button above the file preview.

Next, I'll right click the conflicted file in the 'unstaged' area and open my merge tool (Meld).

When manually refreshing while Meld is open, or after cancelling the merge in Meld, 4 files (generated by Meld, I assume) appear in the 'unstaged' view.

At this point the GUI stops updating automatically. Aborting the merge, switching branches, discarding files, all will still work but only become visible after refreshing manually.

[gadfly3173]

Seems similar with #774, sometimes the inotify watching stopped working. Do you have error logs in ${HOME}/.config/SourceGit or ${HOME}/.sourcegit?

[Doodeletion]

I'm using Linux and ${HOME}/.config/SourceGit exists, but it only contains avatars folder and preference.json.

[gadfly3173]

If this issue is very easy for you to encounter, would you be willing to try using version 8.38 to see if the problem still occurs in that version?

[Doodeletion]

Yes that's no problem, it was very consistent. I'll test with 8.38 tomorrow.

[Doodeletion]

If this issue is very easy for you to encounter, would you be willing to try using version 8.38 to see if the problem still occurs in that version?

This also happens in 8.38

I noticed something else though. In 2025.03, when a conflict arises during merge, the Merge Branch popup will stay open, while in 8.38 it is closed as expected.

[gadfly3173]

This also happens in 8.38

I initially suspected that changes in dotnet 9 might have caused this issue. However, since downgrading to dotnet 8 (v8.38) also presents the same problem, it could be an issue with the dotnet runtime on a specific platform. Could you provide detailed information about your system?

I noticed something else though. In 2025.03, when a conflict arises during merge, the Merge Branch popup will stay open, while in 8.38 it is closed as expected.

Judging from the code, version 8.38 should not automatically close either... However, this issue should have been fixed in #933, so there's no need to worry about it.

[Doodeletion]

Sure, what info do you need?

I used the amd64.deb package to install SourceGit.

OS: Debian Bookworm

dotnet --list-sdks
9.0.102 [/usr/share/dotnet/sdk]


dotnet --list-runtimes
Microsoft.AspNetCore.App 9.0.1 [/usr/share/dotnet/shared/Microsoft.AspNetCore.App]
Microsoft.NETCore.App 9.0.1 [/usr/share/dotnet/shared/Microsoft.NETCore.App]

[Doodeletion]

Judging from the code, version 8.38 should not automatically close either... However, this issue should have been fixed in #933, so there's no need to worry about it.

I just tested on the current dev branch and it still happens.

[gadfly3173]

I just tested on the current dev branch and it still happens.

I tested on Windows 10, it works fine. That's wierd.

[Doodeletion]

I'll switch OS and check if it works on windows 10 for me.

[Doodeletion]

Can confirm, it worked on windows 10.

[gadfly3173]

Are you only encountered the issue of automatic refresh stopping after opening an external merge tool? I suspect that after executing the git mergetool command

sourcegit/src/ViewModels/WorkingCopy.cs

Lines 467 to 475 in d1f3469

	public async void UseExternalMergeTool(Models.Change change)
	{
	var toolType = Preferences.Instance.ExternalMergeToolType;
	var toolPath = Preferences.Instance.ExternalMergeToolPath;
	_repo.SetWatcherEnabled(false);
	await Task.Run(() => Commands.MergeTool.OpenForMerge(_repo.FullPath, toolType, toolPath, change.Path));
	_repo.SetWatcherEnabled(true);
	}

, Git did not receive feedback from Meld, leading the program to believe that the Meld is still in progress. You can consider deleting the SetWatcherEnabled before and after and then running it to try. The purpose of stopping monitoring here may need to be confirmed with the repository maintainer.

[love-linger]

Message ID: ***@***.***>it is safe to remove these two lines

[Doodeletion]

I'll test if removing those lines fixes the issue tomorrow.