Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2016-10-18 17:06:38 -04:00
commit e434e8b693
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
2 changed files with 16 additions and 0 deletions

View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="openmedi"
subject="comment 7"
date="2016-10-18T17:37:38Z"
content="""
Not that I know of. I tried a whole bunch of things, like deleting remotes, killing processes trying to switch between repo versions, modes, playing around in config files etc. etc. Not all of them were smart ideas, I admit. At some point it worked and if I remember correctly I tried to delete a branch and then the problems started. But adjusted branches seems to me like a too advanced feature to use.
Btw.: Skipping over these entries doesn't help for me. It still tries to repair the repo (which takes maybe 4 hours, including having to initiate a temporary repo).
"""]]

View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="openmedi"
subject="comment 8"
date="2016-10-18T17:38:53Z"
content="""
The \"at some point\" portion of my previous message refers to a state before the problems started, not after or in between. Sorry for being unclear.
"""]]