Merge branch 'review2-p5a-fix2-desktop' into review2-p5a-int2

# Conflicts:
#	i18n/en/Editor.resx
#	i18n/en/Tooltips.resx
#	i18n/it/Tooltips.it.resx
#	src/Chronos.Data/Workspaces/WorkspaceSync.cs
#	tests/Chronos.Data.Tests/Workspaces/WorkspaceRecoveryTests.cs
This commit is contained in:
Alby96 committed 2026-11-03 12:15:27 +01:00
commit 47c660735f
30 files changed
+1021 -110

No files matched your search

@@ -419,6 +419,16 @@ public sealed class WorkspaceProject
}
}
/// <summary>
/// Writes a version straight into <c>versions/.replaced</c>: kept, never part of the chain of versions to send (the
/// working state a take of the server's values replaced).
/// </summary>
internal void WriteAside(ProjectVersion version)
{
ArgumentNullException.ThrowIfNull(version);
ProjectSidecars.WriteVersion(Path.Combine(VersionsDirectory, ReplacedFolder, Path.GetFileName(VersionPath(version))), version);
}
/// <summary>Moves tried, some 1 s in all, before a version file held open fails to move aside.</summary>
private const int SetAsideAttempts = 15;