diff options
author | 2014-07-10 15:18:02 -0400 | |
---|---|---|
committer | 2014-07-10 15:18:02 -0400 | |
commit | 5541d48f4e676e6ddd930f4615bc7bf5244bf6e0 (patch) | |
tree | 627e09a9d04ff106909f2956a223f2dcc791bd71 | |
parent | 70e8fdadb3c29e23f66efab1ffda436fb7f03828 (diff) | |
parent | ca78a792ab7cf929b219f37c6b9f46893f229e35 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
2 files changed, 29 insertions, 0 deletions
diff --git a/doc/bugs/OSX_assistant_fails_to_download_new_file_after_initial_pass/comment_2_47196f7e781137751ebd1a1d7083838a._comment b/doc/bugs/OSX_assistant_fails_to_download_new_file_after_initial_pass/comment_2_47196f7e781137751ebd1a1d7083838a._comment new file mode 100644 index 000000000..ee5ad138e --- /dev/null +++ b/doc/bugs/OSX_assistant_fails_to_download_new_file_after_initial_pass/comment_2_47196f7e781137751ebd1a1d7083838a._comment @@ -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? +"""]] diff --git a/doc/bugs/files_lost_during_upgrade/comment_2_80ba8c217e83c9d44a9dc52f4028719d._comment b/doc/bugs/files_lost_during_upgrade/comment_2_80ba8c217e83c9d44a9dc52f4028719d._comment new file mode 100644 index 000000000..b09df4eeb --- /dev/null +++ b/doc/bugs/files_lost_during_upgrade/comment_2_80ba8c217e83c9d44a9dc52f4028719d._comment @@ -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. +"""]] |