diff options
9 files changed, 214 insertions, 10 deletions
diff --git a/doc/bugs/Android:_Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__.mdwn b/doc/bugs/Android:_Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__.mdwn new file mode 100644 index 000000000..79f1e270d --- /dev/null +++ b/doc/bugs/Android:_Adding_Repository_on_Remote_Server_fails_with___34__Internal_Server_Error__34__.mdwn @@ -0,0 +1,17 @@ +### Please describe the problem. + +On Andorid adding a respository on a remote server (ssh) to an exisiting repository does not work. After selecting "Make unencrypted repository" in the webapp the following error message is displayed: + +Internal Server Error +/sdcard/git-annex.home/.ssh/config: setFileMode: permission denied (Operation not permitted) + +The file "/sdcard/git-annex.home/.ssh/config" is created and its content seems to be fine. I could not find anything related to file mode in logcat / daemon.log. + +### What steps will reproduce the problem? + +Add a repository on a remote server to an existing repository. After selecting "Make unencrypted repository" the error messages is displayed. + +### What version of git-annex are you using? On what operating system? + +git-annex version 5.20140116-g2d9ec29 +Android version 4.4 (running on a Nexus 5) diff --git a/doc/bugs/assistant_on_windows_adding_remote_containing_linux_paths.mdwn b/doc/bugs/assistant_on_windows_adding_remote_containing_linux_paths.mdwn new file mode 100644 index 000000000..cdaabf78e --- /dev/null +++ b/doc/bugs/assistant_on_windows_adding_remote_containing_linux_paths.mdwn @@ -0,0 +1,14 @@ +### Please describe the problem. + +Internal Server Error + +internal error, /home/michele/assistannex is not absolute + +### What steps will reproduce the problem? + +create a transfer repository on a usb drive (from windows) merge it with a repository on linux, try to merge it on another target windows machine + +### What version of git-annex are you using? On what operating system? + +git-annex version 5.20140128-g29aea74 + diff --git a/doc/bugs/sync_--content_tries_to_copy_content_to_metadata_only_repos.mdwn b/doc/bugs/sync_--content_tries_to_copy_content_to_metadata_only_repos.mdwn new file mode 100644 index 000000000..073d5eb0f --- /dev/null +++ b/doc/bugs/sync_--content_tries_to_copy_content_to_metadata_only_repos.mdwn @@ -0,0 +1,27 @@ +### Please describe the problem. + + +### What steps will reproduce the problem? + +git annex sync --content + + +### What version of git-annex are you using? On what operating system? + +Mac OSX Maverics + +git-annex version: 5.20140127 +build flags: Assistant Webapp Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash +key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL + +### Please provide any additional information below. + +[[!format sh """ +copy Books/Paperless - Agile Bits Edition/Paperless Video/5-4 PDFpen for iPad.m4v (to origin...) +FATAL: suspicious characters loitering about 'git-annex-shell 'recvkey' '/~/users/akraut/annex-home' 'SHA256E-s98445427--5fb5fd6e082eec4a805261764ef982aa8f12d76e07e86a6abb05e7675762ac49.m4v' '--' 'remoteuuid=03ac7aa9-d14c-4b60-adae-02e4a5ec0fa8' 'direct=' 'associatedfile=Books/Paperless - Agile Bits Edition/Paperless Video/5-4 PDFpen for iPad.m4v' '--' dummy rsync --server -v --inplace .' +rsync: connection unexpectedly closed (0 bytes received so far) [sender] +rsync error: the --max-delete limit stopped deletions (code 25) at /SourceCache/rsync/rsync-42/rsync/io.c(452) [sender=2.6.9] + + rsync failed -- run git annex again to resume file transfer +failed +"""]] diff --git a/doc/bugs/tweaks_to_directory_special_remote_doco.mdwn b/doc/bugs/tweaks_to_directory_special_remote_doco.mdwn new file mode 100644 index 000000000..1a59e44a5 --- /dev/null +++ b/doc/bugs/tweaks_to_directory_special_remote_doco.mdwn @@ -0,0 +1,74 @@ +### Please describe the problem. + +I found the discussion in [directory](/special_remotes/directory) quite confusing until I looked at it the right way. Some tweaking of the documentation might help. + +### What steps will reproduce the problem? + +Possible method - get a newbie to read the page. + +### What version of git-annex are you using? On what operating system? + +n/a + +### Please provide any additional information below. + +Below is an untested patch that I think would make the documentation more helpful to me on a first reading. + + Tweaks to doc/special_remotes/directory.mdwn + + * document the 'directory' option (!) + * try to make it clearer what is different about this remote, + including giving an example of how the directory structure looks. + * grammar fix in opening paragraph + + --- + doc/special_remotes/directory.mdwn | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + + diff --git a/doc/special_remotes/directory.mdwn b/doc/special_remotes/directory.mdwn + index 4d72e8b..7f076b3 100644 + --- a/doc/special_remotes/directory.mdwn + +++ b/doc/special_remotes/directory.mdwn + @@ -1,10 +1,12 @@ + This special remote type stores file contents in directory. + + One use case for this would be if you have a removable drive that + -you want to use it to sneakernet files between systems (possibly with + +you want to use to sneakernet files between systems (possibly with + \[[encrypted|encryption]] contents). Just set up both systems to use + the drive's mountpoint as a directory remote. + + +Note that directory remotes have a special directory structure + +(by design, the same as the \[[rsync|rsync]] remote). + If you just want two copies of your repository with the files "visible" + in the tree in both, the directory special remote is not what you want. + Instead, you should use a regular `git clone` of your git-annex repository. + @@ -14,6 +16,8 @@ Instead, you should use a regular `git clone` of your git-annex repository. + These parameters can be passed to `git annex initremote` to configure the + remote: + + +* `directory` - The path to directory in which the remote resides + + + * `encryption` - One of "none", "hybrid", "shared", or "pubkey". + See \[[encryption]]. + + @@ -31,3 +35,13 @@ Setup example: + + # git annex initremote usbdrive type=directory directory=/media/usbdrive/ encryption=none + # git annex describe usbdrive "usb drive on /media/usbdrive/" + + + +Usage example: + + # git annex copy mycoolfile.mp4 --to usbdrive + + # ls -aF /media/usbdrive + + ./ ../ 42b/ .git/ tmp/ + + # git annex whereis mycoolfile.mp4 + + whereis mycoolfile.mp4 (2 copies) + + 320053d5-892f-46d2-89f0-d6e9d09e6398 -- here + + 6747a48b-fad2-41a7-9033-8d8daa35c5f8 -- usbdrive + + ok + -- + 1.8.5.2 + + + +# End of transcript or log. diff --git a/doc/devblog/day_104__unused_II/comment_1_a693a56123497a39c30cbd35b8e35bce._comment b/doc/devblog/day_104__unused_II/comment_1_a693a56123497a39c30cbd35b8e35bce._comment new file mode 100644 index 000000000..a4893f63a --- /dev/null +++ b/doc/devblog/day_104__unused_II/comment_1_a693a56123497a39c30cbd35b8e35bce._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawm7AuSfii_tCkLyspL6Mr0ATlO6OxLNYOo" + nickname="Georg" + subject="state of windows" + date="2014-01-28T10:29:41Z" + content=""" +Any idea when this stuff will end in the windows build? I am currently fiddling around with git-annex on windows (btw: great work on that so far!) and the unused files config would be highly valueable to me, since I want to mostly use it to push files out to my server from my work machine or my windows tablet, while preventing to clog up too much space. And since I am lazy, I would love to leave the house keeping to git-annex ;) + +An additional question on the windows build: which of the backends can actually make use of windows proxy settings? I guess if webdav was in the list of supported backends, it would work fine, since it is only http, but since it is missing, which of the others would work through just a standard configured squid proxy? For my work machine this is the only way to reach the outside world, doing https to my web server. +"""]] diff --git a/doc/forum/git_annex_copy_more_informative_about_why_some_files_are_not_copied.mdwn b/doc/forum/git_annex_copy_more_informative_about_why_some_files_are_not_copied.mdwn new file mode 100644 index 000000000..3bb2fe176 --- /dev/null +++ b/doc/forum/git_annex_copy_more_informative_about_why_some_files_are_not_copied.mdwn @@ -0,0 +1,59 @@ +I just spend an hour to understand why the following command did not do anything: + + $ git annex copy --to someremote SomeDirectory + +With SomeDirectory containing a lot of file that are not in the someremote repository. +I just realized that the annex from which I run the command did not contain those files either. + +I then did + + $ git annex get SomeDirectory + +So that now the git annex copy command correctly copies the files to the someremote remote. + +I hope I won't fall into that trap again, but I think it is very annoying not to know why nothing happened. + +Wouldn't it be great if the git annex copy command would indicate why some file are not copied, like: + + $ git annex copy --to someremote SomeDirectory + Cannot copy SomeFile1 since it is not present in here, (hint: run git annex get first) + Cannot copy SomeFile2 since it is not present in here, (hint: run git annex get first) + Cannot copy SomeFile3 since it is not present in here, (hint: run git annex get first) + ... + +May be this kind of information could be provided if the verbose flag is set. + +Another awesome (totally subjectively speaking) way of doing it could be to get the file before copying it + + $ git annex copy --to someremote SomeDirectory + Cannot copy SomeFile1 since it is not present in here, attempting getting it first + get SomeFile1 (from someotherremote...) + SHA256E-s109353088--71734pq1p4qo6qs1p156r48s2290q7p61p1658029p103591nrs1rr708s064p59 + 12,615,808 100% 161.27kB/s 0:01:16 (xfr#1, to-chk=0/1) + ok + copy SomeFile1 (checking someremote...) (to someremote...) + SHA256E-s109353088--71734pq1p4qo6qs1p156r48s2290q7p61p1658029p103591nrs1rr708s064p59 + 12,615,808 100% 161.27kB/s 0:01:16 (xfr#1, to-chk=0/1) + ok + Cannot copy SomeFile2 since it is not present in here, attempting getting it first + get SomeFile2 (from someotherremote...) + SHA256E-s109353088--71734pq1p4qo6qs1p156r48s2290q7p61p1658029p103591nrs1rr708s064p59 + 12,615,808 100% 161.27kB/s 0:01:16 (xfr#1, to-chk=0/1) + ok + copy SomeFile2 (checking someremote...) (to someremote...) + SHA256E-s109353088--71734pq1p4qo6qs1p156r48s2290q7p61p1658029p103591nrs1rr708s064p59 + 12,615,808 100% 161.27kB/s 0:01:16 (xfr#1, to-chk=0/1) + ok + Cannot copy SomeFile3 since it is not present in here, attempting getting it first + get SomeFile3 (from someotherremote...) + SHA256E-s109353088--71734pq1p4qo6qs1p156r48s2290q7p61p1658029p103591nrs1rr708s064p59 + 12,615,808 100% 161.27kB/s 0:01:16 (xfr#1, to-chk=0/1) + ok + copy SomeFile3 (checking someremote...) (to someremote...) + SHA256E-s109353088--71734pq1p4qo6qs1p156r48s2290q7p61p1658029p103591nrs1rr708s064p59 + 12,615,808 100% 161.27kB/s 0:01:16 (xfr#1, to-chk=0/1) + ok + +We could also specify from which remote to get the file with + + $ git annex copy --to someremote --from someotherremote SomeDirectory diff --git a/doc/forum/howto_to_link_to_existing_direct_mode_git-annexes.mdwn b/doc/forum/howto_to_link_to_existing_direct_mode_git-annexes.mdwn new file mode 100644 index 000000000..cab2ec0c6 --- /dev/null +++ b/doc/forum/howto_to_link_to_existing_direct_mode_git-annexes.mdwn @@ -0,0 +1,5 @@ +I have created two git-annexes (one on my laptop and one on my work pc) The are using nearly the same files with some files existing only on the pc but not on the laptop as they are too large for the laptop. How do I get the two into sync. I found the manual in the tips section but that will create normal git-annexes with all files linked only. However, I would like to have my exiting file structure unchanged (the way the assistant does it by default) + +any ideas? + +Gregor diff --git a/doc/news/version_5.20140127/comment_1_776574c242235d9256da287048e38dc0._comment b/doc/news/version_5.20140127/comment_1_776574c242235d9256da287048e38dc0._comment new file mode 100644 index 000000000..da9672e19 --- /dev/null +++ b/doc/news/version_5.20140127/comment_1_776574c242235d9256da287048e38dc0._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="EskildHustvedt" + ip="80.202.103.101" + subject="comment 1" + date="2014-01-28T19:48:27Z" + content=""" +Could you kick the standalone builder? No standalone build for this release yet. +"""]] diff --git a/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex/comment_1_6bb1432d85faef2087d3744f43f5bf12._comment b/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex/comment_1_6bb1432d85faef2087d3744f43f5bf12._comment deleted file mode 100644 index eb8b81223..000000000 --- a/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex/comment_1_6bb1432d85faef2087d3744f43f5bf12._comment +++ /dev/null @@ -1,10 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawlUmrSFcLMuk2ny0QNlx4BosEuhG0ij0XQ" - nickname="Gregor" - subject="Same thing using the assistant?" - date="2014-01-27T16:44:13Z" - content=""" -Hi can this also be done using the assistant. If I follow above instructions I end up with the directories being full of symlinks instead of the actual data. Using the assistant I get repositories that are still my original files (which I prefer). How can I sync two such repositories (created using existing data and the assistant)? - -Gregor -"""]] |