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 2014-09-24 10:52:03 -04:00
commit 459db7a367
10 changed files with 80 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/bugs/sync_does_not_preserve_timestamps/comment_1_caf5e5cb17f4d05fff8c2fab661cd93f._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.144"
subject="comment 1"
date="2014-09-23T20:27:25Z"
content="""
The closest git comes to storing a timestamp is the date of the last commit of a file for mtime, and first commit for ctime. However, those are pretty expensive to look up for a given file. And git doesn't try to preserve timestamps in checkouts at all, which argues that git-annex, at least at the command line, should not either.
"""]]

12
doc/bugs/sync_does_not_preserve_timestamps/comment_2_c337fca1474b5b78f61ad6f421138ae4._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmK0703vNSIQsP1mGf-4MAPnsBZiSc6yVo"
nickname="Emre"
subject="comment 2"
date="2014-09-23T20:58:10Z"
content="""
Thanks Joey for the comment.
But when syncing two repos, timestamps are critical at least for my use case. I can't lose this info. Even if it's expensive.
Appreciate if you can consider to add it for direct mode repos, ie when a file is synced to another repo and created there, it shall carry at least the mtime of the file in source repo. Owncloud sync does it, btsync does it, although I know git-annex is different than those.
"""]]

8
doc/bugs/sync_does_not_preserve_timestamps/comment_3_9a3eeddc46e5a420575f00cb47caf703._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmK0703vNSIQsP1mGf-4MAPnsBZiSc6yVo"
nickname="Emre"
subject="comment 3"
date="2014-09-23T21:15:29Z"
content="""
Btw, git storing the last commit time as Mtime is not enough, it shall store the original timestamp of the file, not the date of commit. Hope I could explain and hope this is something doable.
"""]]

10
doc/bugs/sync_does_not_preserve_timestamps/comment_4_99b064259fc2e3c6eb83c3da3b2d3bac._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://svario.it/gioele"
nickname="gioele"
subject="comment 4"
date="2014-09-24T07:15:09Z"
content="""
You can try to store the timestamps just before commit and restore them on checkout.
Have a look at [metastore](https://github.com/przemoc/metastore): it is a ready-made solution for plain git. Maybe you can adapt it to git-annex.
"""]]

14
doc/forum/Git_annex_assistant_can__39__t_find_rsync_nor_git-annex_on_server.mdwn Normal file
View file

@ -0,0 +1,14 @@
Hi, I'm trying to setup git annex assistant (my first time).
When I add the server (in "transfert" mode, if that matters) I get the following error:
"Neither rsync nor git-annex are installed on the server. Perhaps you should go install them?"
I manually verified that both rsync and git/git-annex are installed and available from PATH in the "annex" account and all seems to be ok.
Can you suggest a way to get a more specific information on the source of the error?
My first guess was that this is due to the fact that rsync and git-annex are installed in "non-standard locations". My server run NixOS (http://nixos.org) which has a completely different convention about directory hierarchy from traditional linux/unix OS (that is, no /usr/bin /usr/lib etc.). However, I tried to "cheat" by manually adding symbolic links into a /usr/bin but this didn't work either, so I might be looking in the wrong direction.
Any suggestion appreciated, thank you in advance,
Marco

9
doc/forum/Git_annex_assistant_can__39__t_find_rsync_nor_git-annex_on_server/comment_1_75c599cc26e7d3645f69173861d4f8be._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawn26A25mnLHRtWAP587-NPwEFKzolmENL4"
nickname="Marco"
subject="Also with standalone git-annex"
date="2014-09-24T14:14:43Z"
content="""
Update: I also tried to install the standalone distribution in the home of the annex user on the server as shown in the video (BTW, nice illustration!), but I get the same error.
(On the client side I installed the osx app instead.)
"""]]

3
doc/forum/XMPP_problem_behind_router.mdwn Normal file
View file

@ -0,0 +1,3 @@
I'm trying to configure a jabber account for use with git-annex, but it seems that something's wrong as soon as I try to go through my router (wired or wireless). Compared to directly connecting to my modem, wireshark shows a lot of TCP retransmissions, eventually resulting in "Unable to connect to the Jabber server. Maybe you entered the wrong password? (Error message: host gmail.com:5222 failed: connect: timeout (Connection timed out))" in the webapp.
I've tried to configure the account both in the webapp and manually in the .git/annex/creds/xmpp file, but it doesn't seem to make a difference. It's able to connect if I directly connect it to my modem, so I'm fairly sure it's not a problem at my computer or with the credentials. It doesn't appear to be a problem at the firewall on the router, but I could certainly be missing something. Are there some other tests I could try to narrow down the problem?

8
doc/forum/XMPP_problem_behind_router/comment_1_25a7f8dc5cf14cda4d76b2f8c6ca77d5._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://me.yahoo.com/a/wbh0dY54mcPwTpeOweuPQ8JiZrH3hg--#9b726"
nickname="Joe"
subject="comment 1"
date="2014-09-23T01:15:23Z"
content="""
I forgot to mention that XMPP via other clients (e.g., empathy) works fine.
"""]]

8
doc/install/OSX/comment_9_f11f726d1fee3c4c91f3c984e792037d._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc"
nickname="Matthias"
subject="Why different versions?"
date="2014-09-23T10:59:32Z"
content="""
Why are there different versions for 10.7, 10.8, 10.9 anyway? Is it not possible to produce an executable compatible with all these? I mean, it's the same architecture and executable format, not? I guess there has to be a reason, explanations are welcome :-)
"""]]

12
doc/sync/comment_17_675dd8ff219372c9efc780a02e3add53._comment
View file

@ -1,12 +0,0 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmK0703vNSIQsP1mGf-4MAPnsBZiSc6yVo"
nickname="Emre"
subject="Sync between two indirectly connected remotes need XMPP?"
date="2014-09-19T19:37:36Z"
content="""
Need to understand something. I just installed git-annex to my home PC, to my vps and to my office notebook. When I add the VPS as a shared encryption remote on both home PC and office notebook, they do not sync files. I tried assigning Full Backup and Transfer category to the VPS, but it did not help. The home pc and office notebook just sit there and do nothing to sync. For test purpose, I started with empty annex directory and started populating files on the home. It does sync to the VPS, but the office notebook is unaware of it and even if I try a manual sync, nothing happens.
On the other hand, if I start from scratch, add local repo's on both home and office ones, then add XMPP Account on both, then I'm asked to add cloud account, and once I do it on one end, it appears on the other and when I enable sync, they start to work. However, this is not a good scenario as the work network uses a Proxy and as far as I understand, git-annex does not yet support it (did not find any options for it in the webapp).
So did I get right that an XMPP connection is required between indirectly connected repositories on different connections to be able to sync? Ie a having a middleman computer with a repo is not enough.
"""]]