Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
commit
088816353e
2 changed files with 29 additions and 0 deletions
|
@ -0,0 +1,18 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://joeyh.name/"
|
||||
ip="209.250.56.2"
|
||||
subject="comment 2"
|
||||
date="2014-07-10T19:19:36Z"
|
||||
content="""
|
||||
Could you please go into some more detail about these two things:
|
||||
|
||||
> --create repo (transfer mode) on VPS
|
||||
>
|
||||
> --create shared encryption repo (backup mode) on same VPS
|
||||
|
||||
It's not clear to me what kind of repositories these are. Are they bare git repositories? What version of git-annex, if any, is installed on that VPS?
|
||||
|
||||
> git-annex whereis $file does not indicate that the files represented as symlinks are located on the Mac OSX clients in question until after files are manually retrieved
|
||||
|
||||
Well, I'd not expect whereis to say that the file is in a repository until it's retrieved into that repository. However, does whereis, on the OSX clients, ever say that the file has reached one of the repos on the VPS?
|
||||
"""]]
|
|
@ -0,0 +1,11 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://joeyh.name/"
|
||||
ip="209.250.56.2"
|
||||
subject="comment 2"
|
||||
date="2014-07-10T19:10:15Z"
|
||||
content="""
|
||||
Looking back at this bug, it's clearly the same race that I later
|
||||
debugged and fixed in [[bad_merge_commit_deleting_all_files]]. There are instructions in that bug for recovering it.
|
||||
|
||||
In particular, the \"fatal: Could not switch to '/home/jwiklund/Documents/.git/annex/merge/': No such file or directory\" is because of the race; the merge directory is being created and deleted by two contending threads.
|
||||
"""]]
|
Loading…
Reference in a new issue