Error checking in new files
(1) By Doug (doug9forester) on 2025-05-08 05:40:21 [source]
I got the following error checking in 4 new files I added:
dougf@Lenovo:~/.../trunk/email_blasts$ fc
ADDED send_email_principal_invite_social_emotional_wellness_proposal_no_response.html
ADDED send_email_principal_missing_social_emotional_wellness_application.html
ADDED send_email_principal_missing_social_emotional_wellness_application_extend.html
ADDED send_email_sew_grant_how_to_use_template.html
Here is the error:
dougf@Lenovo:~/.../trunk/email_blasts$ fci
editor_shell.exe notepad.exe ../ci-comment-38958D549493.txt
New_Version: c7e2d594053f4704c8770e92187934123e5cb635830557b273bff495ef23382c
ERROR: [reports/BurstFiles.bat] is different on disk compared to the repository
NOTICE: Repository version of [reports/BurstFiles.bat] stored in [file-3e58dbe00e3a296f]
working check-out does not match what would have ended up in the repository: 94b417a34f00586868b9b6d96c899fcc versus 84753b35251b5512d248322920375fc1
dougf@Lenovo:~/.../trunk/email_blasts$ fc
ADDED send_email_principal_invite_social_emotional_wellness_proposal_no_response.html
ADDED send_email_principal_missing_social_emotional_wellness_application.html
ADDED send_email_principal_missing_social_emotional_wellness_application_extend.html
ADDED send_email_sew_grant_how_to_use_template.html
dougf@Lenovo:~/.../trunk/email_blasts$ fci
editor_shell.exe notepad.exe ../ci-comment-D0EEF2211A59.txt
unchanged check-in comment. continue (y/N)? y
New_Version: 6d74cd312e541554580b62d3264d99076b3c4f0e6c74792f795b7d51ad6f8f99
ERROR: [reports/BurstFiles.bat] is different on disk compared to the repository
NOTICE: Repository version of [reports/BurstFiles.bat] stored in [file-7c7ee49a056c02ec]
working check-out does not match what would have ended up in the repository: 94b417a34f00586868b9b6d96c899fcc versus 84753b35251b5512d248322920375fc1
dougf@Lenovo:~/.../trunk/email_blasts$ f version
This is fossil version 2.26 [593ceca27d] 2024-12-17 12:38:33 UTC
Anyone have any idea what the problem is and how to fix it?
(2) By Florian Balmer (florian.balmer) on 2025-05-08 06:20:02 in reply to 1 [link] [source]
You'd need to show us your fc
and fci
scripts/aliases to allow further
investigation, i.e. are they doing anything special?
Similar problems have already been reported:
- Appreciating the "different on disk compared to the repository" error
- Bug with ADDED_BY_MERGE files?
You may find explanations and solutions in the linked posts, i.e. check the
mtime-changes
option.
Please report back if your problem isn't explained and resolved, or if your fc
and fci
commands are doing something fancy.
(3) By Florian Balmer (florian.balmer) on 2025-05-08 06:25:57 in reply to 2 [link] [source]
TL;DR If you're really quick at changing your files so that their time
stamps don't change, you need to disable the mtime-changes
setting, or use
the --hash
option for the ci
command.
(4) By Florian Balmer (florian.balmer) on 2025-05-08 06:36:48 in reply to 2 [link] [source]
Note this problem can also happen if the file time stamps are overwritten (i.e. reset to an older date) when extracting a zip archive into the check-out directory.
(5) By Doug (doug9forester) on 2025-05-08 13:55:21 in reply to 2 [link] [source]
alias f='fossil '
alias fa='fossil add '
alias fc='fossil changes '
alias fci='fossil ci '
alias fd='fossil diff '
alias fdb='fossil diff --by '
alias fdk='fossil diff --tk '
alias fe='fossil extras '
alias fh='fossil help '
alias fs='fossil status '
(6) By Florian Balmer (florian.balmer) on 2025-05-08 14:50:08 in reply to 5 [link] [source]
Hm, nothing too fancy.
Changing this alias should fix your problem:
alias fci='fossil ci --hash '
But maybe it's better to specify the --hash
option only when needed, and make
sure you understand why the time stamp-based change detection failed in your
scenario:
Any script tampering with the files and their time stamps? Fast "change and commit in a series" scripts can cause the reported error if the modifications happen fast enough to hit the same second.
Restored a zip backup archive of the source tree with older time stamps?
Copied over the source tree from FAT (USB drive) to NTFS? The former has lower file time stamp granularity, hence copy operations may result in changed/unexpected time stamps?
You can also use the mtime-changes
to avoid this problem in the future, but
this will slow down Fossil when working with large source trees, as all files
are constantly re-hashed to detect changes.
(7) By Doug (doug9forester) on 2025-05-08 17:38:33 in reply to 6 [link] [source]
Nothing changed my checkout tree. I turned off mtime-changes and the error disappeared. My tree is not that large so I can live with re-hash to detect changes.
I would love to know why I suddenly got this error. And the previous one https://fossil-scm.org/forum/forumpost/160515715a. Weird.
(8) By Florian Balmer (florian.balmer) on 2025-05-08 17:52:48 in reply to 7 [link] [source]
Does the current problem also appear in a Cygwin environment? Maybe somehow related to Cygwin's emulation and caching of file metadata, i.e. Fossil still sees the old file time even though the file contents have already changed.
I'm at loss ... but glad you found a solution.