[[!comment format=mdwn
 username="Atemu"
 avatar="http://cdn.libravatar.org/avatar/d1f0f4275931c552403f4c6707bead7a"
 subject="comment 10"
 date="2021-05-25T11:00:39Z"
 content="""
A new crash just happened. I haven't upgraded git-annex to master yet but the strange closure bug didn't occur this time. Annotated daemon.log:

```
(scanning...) (started...) 
<lots of this>
ssh: connect to host 192.168.101.68 port 22: Connection timed out
<because the MBP is sleeping>
add file.etherpad ok <note: textconv is set up to pipe .etherpad through `jq .` to pretty-print it>
(recording state in git...)

<git annex fsck all the tree's files. I did not trigger this and automatic consistency checks are off!>
(recording state in git...)
(recording state in git...)
git-annex: fsck: 1 failed
(recovering from race...)
ssh: connect to host 192.168.101.68 port 22: Connection timed out
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.


remote: error: cannot lock ref 'refs/heads/master': is at 6e737fee3f50ee203c9db151e3f9d0308c63df9b but expected fc38ba7550f8dd0d29262bc47ae3085403a55784        To ssh://192.168.101.24/~/Annex/Documents.git/ ! [remote rejected]     master -> master (failed to update ref)error: failed to push some refs to 'ssh://192.168.101.24/~/Annex/Documents.git/'ssh: connect to host 192.168.101.68 port 22: No route to host
fatal: Could not read from remote repository.Please make sure you have the correct access rightsand the repository exists.ssh: connect to host 192.168.101.68 port 22: Connection timed out
fatal: Could not read from remote repository.Please make sure you have the correct access rightsand the repository exists.ssh: connect to host 192.168.101.68 port 22: Connection timed out
fatal: Could not read from remote repository.Please make sure you have the correct access rightsand the repository exists.ssh: connect to host 192.168.101.68 port 22: Connection timed out
fatal: Could not read from remote repository.Please make sure you have the correct access rightsand the repository exists.ssh: connect to host 192.168.101.68 port 22: No route to host
fatal: Could not read from remote repository.Please make sure you have the correct access rightsand the repository exists.ssh: connect to host 192.168.101.68 port 22: No route to host
fatal: Could not read from remote repository.Please make sure you have the correct access rightsand the repository exists.  Transfer failed
Unpacking all pack files.
hint: Using 'master' as the name for the initial branch. This default branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint: 
hint: 	git config --global init.defaultBranch <name>
hint: 
hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
hint: 'development'. The just-created branch can be renamed via this command:
hint: 
hint: 	git branch -m <name>
Initialized empty Git repository in /tmp/tmprepoZrGQTy/.git/
Trying to recover missing objects from remote MB-<REDACTED>.
fatal: 'MB-<REDACTED>' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
Trying to recover missing objects from remote SOTERIA.
fatal: 'SOTERIA' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
Trying to recover missing objects from remote MB-<REDACTED>.
fatal: 'MB-<REDACTED>' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
Trying to recover missing objects from remote SOTERIA.
fatal: 'SOTERIA' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
2 missing objects could not be recovered!
To force a recovery to a usable state, retry with the --force parameter.
error: refs/heads/master does not point to a valid object!
error: refs/heads/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/heads/master does not point to a valid object!
error: refs/heads/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/heads/master does not point to a valid object!
error: refs/heads/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/heads/master does not point to a valid object!
error: refs/heads/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/heads/master does not point to a valid object!
error: refs/heads/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/heads/master does not point to a valid object!
error: refs/heads/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/heads/master does not point to a valid object!
error: refs/heads/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/heads/master does not point to a valid object!
error: refs/heads/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
add <.txt render of the etherpad file> fatal: Invalid revision range refs/heads/master..refs/synced/d7d728f7-891a-4035-a758-c7ee80a8017a/master
error: refs/heads/master does not point to a valid object!
error: refs/heads/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/heads/master does not point to a valid object!
error: refs/heads/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
ok
(recording state in git...)
error: refs/heads/master does not point to a valid object!
error: refs/heads/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!

error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
CONFLICT (add/add): Merge conflict in <unrelated but frequently edited file>.org
Auto-merging <file>.org
<a handful of conflicts like this>
Automatic merge failed; fix conflicts and then commit the result.

error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!


100%  3.33 KiB        198 MiB/s 0s
                                  
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
ssh: connect to host 192.168.101.68 port 22: Connection timed out
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!

error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
ssh: connect to host 192.168.101.68 port 22: No route to host


ssh: connect to host 192.168.101.68 port 22: Connection timed out
fatal: Could not read from remote repository.Please make sure you have the correct access rightsand the repository exists.  Transfer failed
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
ssh: connect to host 192.168.101.68 port 22: Connection timed out
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
ssh: connect to host 192.168.101.68 port 22: Connection timed out
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
To ssh://192.168.101.24/~/Annex/Documents.git/
   105d6d0..4bd9661  git-annex -> synced/git-annex
 ! [rejected]        master -> synced/master (fetch first)
error: failed to push some refs to 'ssh://192.168.101.24/~/Annex/Documents.git/'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
ssh: connect to host 192.168.101.68 port 22: No route to host
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
error: refs/remotes/SOTERIA/master does not point to a valid object!
error: refs/remotes/SOTERIA/synced/master does not point to a valid object!
From ssh://192.168.101.24/~/Annex/Documents
 * [new branch]      master        -> SOTERIA/master
 * [new branch]      synced/master -> SOTERIA/synced/master
Auto packing the repository in background for optimum performance.
See \"git help gc\" for manual housekeeping.

error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
To ssh://192.168.101.24/~/Annex/Documents.git/
 ! [rejected]        master -> synced/master (non-fast-forward)
error: failed to push some refs to 'ssh://192.168.101.24/~/Annex/Documents.git/'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
ssh: connect to host 192.168.101.68 port 22: Connection timed out
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
ssh: connect to host 192.168.101.68 port 22: No route to host
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.
To ssh://192.168.101.24/~/Annex/Documents.git/
   8cd959c..4bd9661  git-annex -> refs/synced/8dc76e63-3dac-4cc3-a752-e73e81d57c1a/git-annex
 ! [rejected]        master -> refs/synced/8dc76e63-3dac-4cc3-a752-e73e81d57c1a/master (non-fast-forward)
error: failed to push some refs to 'ssh://192.168.101.24/~/Annex/Documents.git/'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
ssh: connect to host 192.168.101.68 port 22: Connection timed out
```

Git is now trying to merge refs/synced/d7d728f7-891a-4035-a758-c7ee80a8017a/master which points at a commit made on the MBP 4d ago. This commit has previously been **merged** into the original branch on this machine and contains a change to a txt render of a different .etherpad file. This also means that the commit before it contains a change to the according .etherpad file.

My branch is now a single commit made at 11:49:21 that adds the whole state of the working dir.
However, the diff for the .etherpad file says (without textconv):

```
diff --git a/Uni/LAWR/V10/132c6ef4e421c88547d4a228fef3c39491ba0610.etherpad b/Uni/LAWR/V10/132c6ef4e421c88547d4a228fef3c39491ba0610.etherpad
new file mode 100644
index 0000000..33e0a8f
--- /dev/null
+++ b/Uni/LAWR/V10/132c6ef4e421c88547d4a228fef3c39491ba0610.etherpad
@@ -0,0 +1 @@
+/annex/objects/SHA256E-s675354--3b69c1b0549173d731e6259d6c817eebabcd5b43a4e5cf6b83c7498603dae6d2
diff --git a/Uni/LAWR/V10/132c6ef4e421c88547d4a228fef3c39491ba0610.txt b/Uni/LAWR/V10/132c6ef4e421c88547d4a228fef3c39491ba0610.txt
new file mode 100644
index 0000000..f9ce6fe
--- /dev/null
+++ b/Uni/LAWR/V10/132c6ef4e421c88547d4a228fef3c39491ba0610.txt
@@ -0,0 +1 @@
+/annex/objects/SHA256E-s3406--d5168f8722e96719e2cf32d21760690930264aa8c88d76098477d3438fa247ab.txt
```

It added these as a unlocked largefiles despite my largefiles rule excluding them. This has happened before once I think but I manually committed at that time.

The other .etherpad files I had in the tree were not added as largefiles.

I remember having issues with textconv and annex before too and disabling a few rules that I didn't really need.

The git-annex branch seems to be in-tact. However, its commits are a bit weird. Here is `git log synced/git-annex..git-annex --patch`:

```
commit 4bd9661256a12d81186420a16d1bc1fb5f5d261a
Author: Atemu <atemu.main@gmail.com>
Date:   Tue May 25 11:49:22 2021 +0200

    update (recovery from race #1; expected commit parent Ref \"5edabb3782060a334f966387e03252440ef50b10\" but found [Ref \"c518e6a6cac2b966e757a97dc8d26b64743be377\"] )

commit efdaa77dbf258954289366e236f056e50a258e1a
Author: Atemu <atemu.main@gmail.com>
Date:   Tue May 25 11:49:22 2021 +0200

    update

commit c518e6a6cac2b966e757a97dc8d26b64743be377
Author: Atemu <atemu.main@gmail.com>
Date:   Tue May 25 11:49:22 2021 +0200

    update (recovery from race #1; expected commit parent Ref \"5edabb3782060a334f966387e03252440ef50b10\" but found [Ref \"79a6d5f9b7b45ae891529a9bf2ead592f3968faa\"] )

commit fd7d4f7a6c875ca43cfe5e2e34b27c4cd6daab0a
Author: Atemu <atemu.main@gmail.com>
Date:   Tue May 25 11:49:22 2021 +0200

    update

commit 79a6d5f9b7b45ae891529a9bf2ead592f3968faa
Author: Atemu <atemu.main@gmail.com>
Date:   Tue May 25 11:49:22 2021 +0200

    update (recovery from race #1; expected commit parent Ref \"5edabb3782060a334f966387e03252440ef50b10\" but found [Ref \"79190c0161b13aae6570cb24f232ea6ef9288f66\"] )

commit 1276807833ad40c19190049a85ba82b5b171edd2
Author: Atemu <atemu.main@gmail.com>
Date:   Tue May 25 11:49:22 2021 +0200

    update

commit 79190c0161b13aae6570cb24f232ea6ef9288f66
Author: Atemu <atemu.main@gmail.com>
Date:   Tue May 25 11:49:22 2021 +0200

    update

diff --git a/672/674/SHA256E-s3406--d5168f8722e96719e2cf32d21760690930264aa8c88d76098477d3438fa247ab.txt.log b/672/674/SHA256E-s3406--d5168f8722e96719e2cf32d21760690930264aa8c88d76098477d3438fa247ab.txt.log
index 92b1312..0ff0604 100644
--- a/672/674/SHA256E-s3406--d5168f8722e96719e2cf32d21760690930264aa8c88d76098477d3438fa247ab.txt.log
+++ b/672/674/SHA256E-s3406--d5168f8722e96719e2cf32d21760690930264aa8c88d76098477d3438fa247ab.txt.log
@@ -1 +1,2 @@
 1621936161.088002573s 1 8dc76e63-3dac-4cc3-a752-e73e81d57c1a
+1621936161.329141017s 1 b0512e28-91b3-4792-a4ef-71357fc4b63a

commit 5edabb3782060a334f966387e03252440ef50b10
Author: Atemu <atemu.main@gmail.com>
Date:   Tue May 25 11:49:21 2021 +0200

    update

diff --git a/672/674/SHA256E-s3406--d5168f8722e96719e2cf32d21760690930264aa8c88d76098477d3438fa247ab.txt.log b/672/674/SHA256E-s3406--d5168f8722e96719e2cf32d21760690930264aa8c88d76098477d3438fa247ab.txt.log
new file mode 100644
index 0000000..92b1312
--- /dev/null
+++ b/672/674/SHA256E-s3406--d5168f8722e96719e2cf32d21760690930264aa8c88d76098477d3438fa247ab.txt.log
@@ -0,0 +1 @@
+1621936161.088002573s 1 8dc76e63-3dac-4cc3-a752-e73e81d57c1a
diff --git a/672/674/SHA256E-s3406--d5168f8722e96719e2cf32d21760690930264aa8c88d76098477d3438fa247ab.txt.log.met b/672/674/SHA256E-s3406--d5168f8722e96719e2cf32d21760690930264aa8c88d76098477d3438fa247ab.txt.log.met
new file mode 100644
index 0000000..9972f75
--- /dev/null
+++ b/672/674/SHA256E-s3406--d5168f8722e96719e2cf32d21760690930264aa8c88d76098477d3438fa247ab.txt.log.met
@@ -0,0 +1 @@
+1621936161.086396922s day +25 month +5 year +2021

commit 6dbb8cc706949f8ef1dbbbd1003dbe728b642f8a
Author: Atemu <atemu.main@gmail.com>
Date:   Tue May 25 11:45:51 2021 +0200

    update (recovery from race #1; expected commit parent Ref \"1ccaa3ce85972818d9afee1ff047183d8836c927\" but found [Ref \"260477393b0e18fbf0d4fc77afa10ab0069f2d40\"] )

commit 1f035559a42966383b424ebb0dd62509f8259543
Author: Atemu <atemu.main@gmail.com>
Date:   Tue May 25 11:45:51 2021 +0200

    update

commit 260477393b0e18fbf0d4fc77afa10ab0069f2d40
Author: Atemu <atemu.main@gmail.com>
Date:   Tue May 25 11:45:51 2021 +0200

    update

diff --git a/activity.log b/activity.log
index e388b9e..890cae5 100644
--- a/activity.log
+++ b/activity.log
@@ -1,37 +1,8 @@
 00b14f31-5c38-4eb3-b16f-17140b671470 Fsck timestamp=1610259369.931977s
 1968d496-fca5-4b48-ac56-b4de73d6af82 Fsck timestamp=1609853522.83856s
-283a9cfc-cc28-481f-8ab3-28564f61e278 Fsck timestamp=1614085193.126619514s
-283a9cfc-cc28-481f-8ab3-28564f61e278 Fsck timestamp=1614155865.00518998s
 283a9cfc-cc28-481f-8ab3-28564f61e278 Fsck timestamp=1614159798.683064383s
 4ea64ba8-3d84-439d-88c9-021380c3b097 Fsck timestamp=1610235815.801036s
-8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1614161439.951758036s
-8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1614161875.368919604s
-8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1614503753.902534237s
-8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1618474275.133432744s
-8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1619560801.449019468s
-8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1620081126.285146124s
-8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1620655938.401915298s
-8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1621159014.044988654s
-8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1621161156.147989006s
-8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1621161290.856706788s
-8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1621161317.85070715s
-8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1621161413.579088689s
-8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1621328885.881572492s
-8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1621422002.80957147s
+8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1621935951.378910574s
 a45a1abf-086e-40ea-8db5-f286a4fb69ef Fsck timestamp=1609849766.99771s
-d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1614161148.72413s
-d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1614162182.895703s
-d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1614162687.460662s
-d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1618351280.306775s
-d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1619444550.542679s
-d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1619733602.694413s
-d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1619833893.739576s
-d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1620079818.367555s
-d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1620513005.967486s
-d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1620775822.267693s
-d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1621161025.720264s
-d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1621239795.218301s
 d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1621444868.775013s
-f5f5f557-ecf2-4c2e-b704-add87173d58a Fsck timestamp=1612954464.455509s
-f5f5f557-ecf2-4c2e-b704-add87173d58a Fsck timestamp=1614085579.354101s
 f5f5f557-ecf2-4c2e-b704-add87173d58a Fsck timestamp=1614160037.595461s

commit 1ccaa3ce85972818d9afee1ff047183d8836c927
Author: Atemu <atemu.main@gmail.com>
Date:   Tue May 25 11:45:51 2021 +0200

    update

diff --git a/af5/b21/SHA256E-s675354--3b69c1b0549173d731e6259d6c817eebabcd5b43a4e5cf6b83c7498603dae6d2.log b/af5/b21/SHA256E-s675354--3b69c1b0549173d731e6259d6c817eebabcd5b43a4e5cf6b83c7498603dae6d2.log
index 0252166..3150f67 100644
--- a/af5/b21/SHA256E-s675354--3b69c1b0549173d731e6259d6c817eebabcd5b43a4e5cf6b83c7498603dae6d2.log
+++ b/af5/b21/SHA256E-s675354--3b69c1b0549173d731e6259d6c817eebabcd5b43a4e5cf6b83c7498603dae6d2.log
@@ -1 +1,2 @@
 1621935950.772957836s 1 8dc76e63-3dac-4cc3-a752-e73e81d57c1a
+1621935951.025150823s 1 b0512e28-91b3-4792-a4ef-71357fc4b63a

commit 105d6d0ddea616d0f62f5bb78080954545966947
Author: Atemu <atemu.main@gmail.com>
Date:   Tue May 25 11:45:50 2021 +0200

    update

diff --git a/activity.log b/activity.log
index f925d0a..e388b9e 100644
--- a/activity.log
+++ b/activity.log
@@ -1,8 +1,37 @@
 00b14f31-5c38-4eb3-b16f-17140b671470 Fsck timestamp=1610259369.931977s
 1968d496-fca5-4b48-ac56-b4de73d6af82 Fsck timestamp=1609853522.83856s
+283a9cfc-cc28-481f-8ab3-28564f61e278 Fsck timestamp=1614085193.126619514s
+283a9cfc-cc28-481f-8ab3-28564f61e278 Fsck timestamp=1614155865.00518998s
 283a9cfc-cc28-481f-8ab3-28564f61e278 Fsck timestamp=1614159798.683064383s
 4ea64ba8-3d84-439d-88c9-021380c3b097 Fsck timestamp=1610235815.801036s
+8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1614161439.951758036s
+8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1614161875.368919604s
+8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1614503753.902534237s
+8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1618474275.133432744s
+8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1619560801.449019468s
+8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1620081126.285146124s
+8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1620655938.401915298s
+8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1621159014.044988654s
+8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1621161156.147989006s
+8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1621161290.856706788s
+8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1621161317.85070715s
+8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1621161413.579088689s
+8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1621328885.881572492s
 8dc76e63-3dac-4cc3-a752-e73e81d57c1a Fsck timestamp=1621422002.80957147s
 a45a1abf-086e-40ea-8db5-f286a4fb69ef Fsck timestamp=1609849766.99771s
+d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1614161148.72413s
+d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1614162182.895703s
+d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1614162687.460662s
+d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1618351280.306775s
+d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1619444550.542679s
+d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1619733602.694413s
+d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1619833893.739576s
+d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1620079818.367555s
+d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1620513005.967486s
+d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1620775822.267693s
+d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1621161025.720264s
+d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1621239795.218301s
 d7d728f7-891a-4035-a758-c7ee80a8017a Fsck timestamp=1621444868.775013s
+f5f5f557-ecf2-4c2e-b704-add87173d58a Fsck timestamp=1612954464.455509s
+f5f5f557-ecf2-4c2e-b704-add87173d58a Fsck timestamp=1614085579.354101s
 f5f5f557-ecf2-4c2e-b704-add87173d58a Fsck timestamp=1614160037.595461s
diff --git a/af5/b21/SHA256E-s675354--3b69c1b0549173d731e6259d6c817eebabcd5b43a4e5cf6b83c7498603dae6d2.log b/af5/b21/SHA256E-s675354--3b69c1b0549173d731e6259d6c817eebabcd5b43a4e5cf6b83c7498603dae6d2.log
new file mode 100644
index 0000000..0252166
--- /dev/null
+++ b/af5/b21/SHA256E-s675354--3b69c1b0549173d731e6259d6c817eebabcd5b43a4e5cf6b83c7498603dae6d2.log
@@ -0,0 +1 @@
+1621935950.772957836s 1 8dc76e63-3dac-4cc3-a752-e73e81d57c1a
diff --git a/af5/b21/SHA256E-s675354--3b69c1b0549173d731e6259d6c817eebabcd5b43a4e5cf6b83c7498603dae6d2.log.met b/af5/b21/SHA256E-s675354--3b69c1b0549173d731e6259d6c817eebabcd5b43a4e5cf6b83c7498603dae6d2.log.met
new file mode 100644
index 0000000..2aa827d
--- /dev/null
+++ b/af5/b21/SHA256E-s675354--3b69c1b0549173d731e6259d6c817eebabcd5b43a4e5cf6b83c7498603dae6d2.log.met
@@ -0,0 +1 @@
+1621935950.772381243s day +25 month +5 year +2021
diff --git a/efe/f7f/SHA256E-s2496630--0f778a1c32dfddf8098406ff28297d826b28759b4efeb1aa27a1841dd4897248.pdf.log b/efe/f7f/SHA256E-s2496630--0f778a1c32dfddf8098406ff28297d826b28759b4efeb1aa27a1841dd4897248.pdf.log
index 7fd0604..d907850 100644
--- a/efe/f7f/SHA256E-s2496630--0f778a1c32dfddf8098406ff28297d826b28759b4efeb1aa27a1841dd4897248.pdf.log
+++ b/efe/f7f/SHA256E-s2496630--0f778a1c32dfddf8098406ff28297d826b28759b4efeb1aa27a1841dd4897248.pdf.log
@@ -1,3 +1,4 @@
 1621350596.596630026s 1 8dc76e63-3dac-4cc3-a752-e73e81d57c1a
+1621350602.99782945s 1 b0512e28-91b3-4792-a4ef-71357fc4b63a
 1621350603.027097277s 1 b0512e28-91b3-4792-a4ef-71357fc4b63a
 1621445067.293418s 1 d7d728f7-891a-4035-a758-c7ee80a8017a
diff --git a/efe/f7f/SHA256E-s2496630--0f778a1c32dfddf8098406ff28297d826b28759b4efeb1aa27a1841dd4897248.pdf.log.met b/efe/f7f/SHA256E-s2496630--0f778a1c32dfddf8098406ff28297d826b28759b4efeb1aa27a1841dd4897248.pdf.log.met
index b7f2ee1..2e12d4b 100644
--- a/efe/f7f/SHA256E-s2496630--0f778a1c32dfddf8098406ff28297d826b28759b4efeb1aa27a1841dd4897248.pdf.log.met
+++ b/efe/f7f/SHA256E-s2496630--0f778a1c32dfddf8098406ff28297d826b28759b4efeb1aa27a1841dd4897248.pdf.log.met
@@ -1 +1,2 @@
+1621350596.859331937s day +18 month +5 year +2021
 1621445071.205197s day -18 +19 month +5 year +2021
diff --git a/schedule.log b/schedule.log
index 88f8251..f29a67c 100644
--- a/schedule.log
+++ b/schedule.log
@@ -1,7 +1,16 @@
 00b14f31-5c38-4eb3-b16f-17140b671470 fsck self 1h every day at any time timestamp=1610259355.086542s
 1968d496-fca5-4b48-ac56-b4de73d6af82 fsck self 1h every day at any time timestamp=1609853466.30146s
+283a9cfc-cc28-481f-8ab3-28564f61e278 fsck self 1h every day at any time timestamp=1609829311.089081351s
+283a9cfc-cc28-481f-8ab3-28564f61e278 fsck self 1h every day at any time timestamp=1609829331.993124414s
 283a9cfc-cc28-481f-8ab3-28564f61e278 fsck self 1h every day at any time timestamp=1609831717.238587482s
+283a9cfc-cc28-481f-8ab3-28564f61e278 fsck self 8d13h every day at any time timestamp=1609829516.974129064s
 4ea64ba8-3d84-439d-88c9-021380c3b097  timestamp=1610030955.40944s
+4ea64ba8-3d84-439d-88c9-021380c3b097 fsck self 1h every day at any time timestamp=1609857462.383747s
 8dc76e63-3dac-4cc3-a752-e73e81d57c1a  timestamp=1621328896.270884603s
+8dc76e63-3dac-4cc3-a752-e73e81d57c1a fsck self 1h every day at any time timestamp=1614161325.360455592s
+8dc76e63-3dac-4cc3-a752-e73e81d57c1a fsck self 1h every day at any time timestamp=1616330220.055006692s
+8dc76e63-3dac-4cc3-a752-e73e81d57c1a fsck self 1h every day at any time timestamp=1620642662.423064041s
+8dc76e63-3dac-4cc3-a752-e73e81d57c1a fsck self 1h every day at any time; fsck self 10h1m every day at any time timestamp=1616329120.414652786s
 d7d728f7-891a-4035-a758-c7ee80a8017a  timestamp=1621444873.058565s
+d7d728f7-891a-4035-a758-c7ee80a8017a fsck self 1h every day at any time timestamp=1616364223.127229s
 f5f5f557-ecf2-4c2e-b704-add87173d58a fsck self 1h every day at any time timestamp=1610259937.483933s
```

synced/master is in the same state as it was 4d ago, the date of the merge commit git is now trying to merge.
There have only been smallfile changes made to master since.

I'm especially confused by the changes to schedule.log.

***

Looks like there are some major incompatibilities with textconv and git-annex that need to be documented and/or fixed.

Smallfiles don't seem to be handled that well either, perhaps my other issues are related to using those almost exclusively in this repo?  
Automatic merges have never worked for me for example. (Though I probably wouldn't want them anyways).  

Is anyone else having issues with this combination of features? I can't be the only one, right?

"""]]
