mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Joey Hess 2018-10-17 16:32:21 -04:00
commit 7625cc58ae
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/forum/Unlocking_files_gives_symlink_content.mdwn
View file

@ -1,4 +1,4 @@
I am just beginning to use git-annex so it is possible that the following issue was caused by my own mistake. It cropped after commiting a number of files that had been moved between subfolders, and added with `git add -A` etc.
I am just beginning to use git-annex so it is possible that the following issue was caused by my own mistake. It cropped up after commiting a number of files that had been moved between subfolders, and added with `git add -A` etc.
When files are locked, I am able to view their contents. However, when I unlock certain files, their contents appear to be replaced by the contents of the symlink. Locking them again allows me to view their contents. For instance, with one unlocked file, say `test.md`, I get

11
doc/forum/Unlocking_files_gives_symlink_content/comment_2_f50b8ef54737798183490d5a660248f2._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="erewhon_smith@6671dff14d578cb6d55a3ca285f2c54151b69f60"
nickname="erewhon_smith"
avatar="http://cdn.libravatar.org/avatar/b9bd5ad7176ebe149d0f051dcfe0a63e"
subject="comment 2"
date="2018-10-17T18:45:59Z"
content="""
Joey, thanks for the response, not to mention also for this brilliant piece of software. I understand version 6 still being experimental.
Do you have any thoughts on how I can repair my repository at this point so that unlocking files gives me back their contents?
"""]]