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

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

Browse source
This commit is contained in:
Joey Hess 2013-10-20 17:56:25 -04:00
commit 300d3d34f7
8 changed files with 106 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
doc/Android/comment_5_ba11b81c671d9bcd6f496fbd6f562b0f._comment Normal file
View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="http://mebus.myopenid.com/"
ip="2a01:198:3eb:0:4a5b:39ff:fea4:55b3"
subject="comment 5"
date="2013-10-19T18:05:52Z"
content="""
Hallo,
how can I use the app with public/private keys for SSH. Where can I add them?
Thanks
Mebus
"""]]

11
doc/bugs/file_modification_times.mdwn Normal file
View file

@ -0,0 +1,11 @@
### Please describe the problem.
The files created in another remote when syncing is "now" rather than keeping the modification time of the source file. As such, git-annex assistant is removing an important bit of information about the file.
### What steps will reproduce the problem?
1) create two repositories in your computer using webapp
2) add files to RepoA, see that they are synced to the RepoB.
3) check the file modification times from any file manager. you will see that while files in RepoA carry correct modification time, synced file in RepoB carries current time.
### What version of git-annex are you using? On what operating system?
Ubuntu 13.10 32bit version 4.20130815 from apt-get.

11
doc/forum/Git_Annex_Assistant:_How_to_add_a_remote__63__.mdwn Normal file
View file

@ -0,0 +1,11 @@
Hi,
I am trying to use Git Annex Assistant on my Fedora Linux computer. I currently have a local repository that assistant monitors, but now I want to use my personal server as a git remote for the repository. I click on Configuration > Remote server and it prompts me for my server login credentials and then click the "Check this server" button. After this I am shown a screen that assistant is "Ready to add remote server" and then states:
> The server <MY IP ADDRESS HERE> can be used as is, but installing git-annex on it would make it work better, and provide more options below.
>
> If you're able to install software on the server, do so and click Retry
The information shown below this message is regarding encrypting the data (if I have git-annex installed on the server, which I don't). So my question is, what do I do now? There is no button to just add the remote from within git annex assistant? I created a bare repository on my server and added a remote manually inside the repository on my local machine, but git annex assistant doesn't notice it. I'm clueless on what git annex assistant is expecting from me at this point. I would think what I'm trying to do is one of the most common use cases for git annex, but I can't find any documentation or materials on the correct procedure for this. Any help is appreciated.
Regards,
Blake

5
doc/forum/Retrieve_previous_version_in_direct_mode.mdwn Normal file
View file

@ -0,0 +1,5 @@
I use the assistant with a local directory in direct mode. I have read in different places that direct mode does not ensure that past versions of files are preserved.
What precisely happens to past versions? Under which conditions are past versions kept?
How would I go about retrieving the past version of a file in direct mode?

16
doc/forum/Walkthrough_does_not_work_for_me__44___what_am_i_doing_wrong__63__.mdwn Normal file
View file

@ -0,0 +1,16 @@
I'm trying to use git-annex as a dropbox-replacement, but I'm hitting unexpected things although I'm doing exactly what I see in the walkthrough screencast and/or the walkthrough commands. I'm using Ubuntu 13.10, installed git-annex with apt-get. It is version 4.20130815.
1) I launch the webapp and create an ~/annex folder as my initial repo. I copy some small text files in it, I see in webapp that they are added.
2) I add a new "Removable Storage" repo, in my usb drive. I do not touch any other settings, leave it as is. (ie in transfer group for example). It is successfully added to the repo list and I see sync complete and files synced on the webapp.
3) When I check the contents of the usb disk annex folder, I see the following, while I was expecting to see the files I synced instead.
emre@emrenb:~$ ls /media/emre/348B-78F0/annex/
annex branches config description HEAD hooks info objects refs
However, I expect the below which is the content of my ~/annex folder:
emre@emrenb:~$ ls annex/
unison-sync.log unison-1.log unison-2.log unison.log
In the walkthrough video, when Joey adds a USB storage, the filenames & thir contents sync to the usb drive. Why doesn't it work for me?
Note that I tried also android app and also the zipped tarball build. Same result, I never see actual files.

8
doc/forum/reinstalled_os__44___cloned_annex__44___does_not_recognize_remote.mdwn Normal file
View file

@ -0,0 +1,8 @@
Hi,
I switched distribution and cloned my annex from the backup afterwards. getting the files from my backup worked fine, but i have a remote on an external disk and git-annex keeps saying it's unavailable despite it being there. I have the same username and hostname as on my old system so and the remote repo still has the uuid 3d661c5e-c84e-4902-b52e-decbafadfa4f. The only thing that changed is the path, it's know mounted unter /var/run/media/phaer/95... but a symlinked to the path below did not help. Any suggestions?
3d661c5e-c84e-4902-b52e-decbafadfa4f -- phaer@kassiopeia:/media/phaer/9502bc14-b83e-471a-95a8-80ff9072a4ab/annex
and thank you for this amazing piece of software.

10
doc/install/OSX/comment_31_09084a7b3cf06bfa3add0f4991476ffe._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://alan.petitepomme.net/"
nickname="Alan Schmitt"
subject="dbus and homebrew"
date="2013-10-20T17:25:04Z"
content="""
I'm trying to build git-annex with dbus support, and even though I installed dbus (through homebrew), at the end of compilation I get the warning about \"building without dbus\". Is there something special I need to do for git-annex to see I have installed dbus?
(Also, it tells me at the beginning that I don't have gcrypt, but libgcrypt is installed.)
"""]]

29
doc/tips/using_gitolite_with_git-annex/comment_15_dc6f21b5a3d5931c8d949a9753411b9e._comment Normal file
View file

@ -0,0 +1,29 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnRaueN1AcM8pIMofH5-wQ1Kr4T0GBe8sA"
nickname="wayne"
subject="git-annex with gitolite-rc"
date="2013-10-19T17:03:32Z"
content="""
@François
The proper array in .gitolite.rc seems to be the \"ENABLE\" array, which it appears is parsed into the COMMANDS array in src/lib/Gitolite/Rc.pm
@Khaije
Using 'git-annex-shell' => 'ua' doesn't seem to work for me. The program still fails in src/gitolite-shell around line 163 (gitolite repo version b1d3c05):
_die \"suspicious characters loitering about '$soc'\"
if $rc{COMMANDS}{ words[0] } ne 'ua' and $soc !~ $REMOTE_COMMAND_PATT;
When I insert $rc{COMMANDS}{ words[0] } into the _die message, it shows up as \"1\" instead of \"ua\" as I was expecting.
When I manually set $rc{COMMANDS}{ words[0] } to 'ua' slightly earlier in the script, the git-annex-shell command gets run but it seems to fail to parse the result of the configlist command properly because then I get
Failed to get annex.uuid configuration of repository origin
Instead, got: \"annex.uuid=\ncore.gcrypt=\n\"
I am actually about to give up on the notion of using git-annex and gitolite together. Maybe. I am interested to know if anyone else is having similar problems.
"""]]