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 2012-09-15 20:17:03 -04:00
commit 9a9b4b840e
7 changed files with 127 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
doc/bugs/Building_in_cabal_using_--bindir___126____47__bin_breaks_the_desktop_link.mdwn Normal file
View file

@ -0,0 +1,14 @@
What steps will reproduce the problem?
Download the sourcecode, build using 'cabal build', then install using 'cabal install --bindir ~/bin'.
What is the expected output? What do you see instead?
The .desktop file contains `~/bin/git-annex webapp` as command which is of course a invalid command as ~ is not expanded when running the desktop file.
What version of git-annex are you using? On what operating system?
Latest Head from git, Ubuntu 12.04
Please provide any additional information below.
I'm not sure whether this is a bug or not. I just ran into problems because I did not expect the cabal build process to create my desktop file but instead thought that git-annex will create it by it-self taking its own path. Perhaps it would make sense to produce an error if the bindir is invalid. An automatic expansion of '~' in the build script would be even better.

8
doc/bugs/Building_in_cabal_using_--bindir___126____47__bin_breaks_the_desktop_link/comment_1_c0f0a2878070ed86900815c6b6a5fa5e._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.0.60"
subject="comment 1"
date="2012-09-15T16:39:19Z"
content="""
Something is going on that I don't understand. When I run `cabal install --bindir ~/bin`, my shell passes `/home/joey/bin` to cabal, so of course it works.
"""]]

2
doc/design/assistant/polls/prioritizing_special_remotes.mdwn
View file

@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync.
Help me prioritize my work: What special remote would you most like
to use with the git-annex assistant?
[[!poll open=yes 9 "Amazon S3" 5 "Box.com" 28 "My phone (or MP3 player)" 1 "Tahoe-LAFS" 3 "OpenStack SWIFT" 9 "Google Drive" 5 "Amazon Glacier"]]
[[!poll open=yes 12 "Amazon S3" 5 "Box.com" 35 "My phone (or MP3 player)" 1 "Tahoe-LAFS" 3 "OpenStack SWIFT" 9 "Google Drive" 6 "Amazon Glacier"]]
This poll is ordered with the options I consider easiest to build
listed first. Mostly because git-annex already supports them and they

25
doc/forum/Don__39__t_understand_how_to_delete__47__recover_files.mdwn Normal file
View file

@ -0,0 +1,25 @@
My Use Case:
I try basicly to use annex as a raid-like tool (at least thats the first step)
so I added some big files to it, and then I synced it to a usb-remote. So far all did go well...
No I startet annex watch daemon... because I thought it would then watch the files and checkin and out at least for the "origin" copy of the files.
Then I thought lets delete some files I dont need anymore... so... rm.... ^^
Maybe I just wanted to see what happens or if that would magicly do what I wanted him to do... ok I knew that it would not delete the file on the usb-drive (backup...) ok... but maybe at least localy...
Now what did happen instead of that... the links are gone yes... the files it self are in the .git objects tree, so they did not get deleted, so ok not the way I wanted... have to unlock it first, would make maybe sense...
So I tried first to get the links back... tried fix, tried unused, tried get... but the links doesnt show up again...
is there a way to first bring back the links?
is it save or the right way to just git rebase HEAD~3 to bring the links back?
and then when I want to delete files from all places whats the way to do that... annex unlock -> then delete? or git drop filex --copies=0 or something?
like I said I try to use is like a more flexible raid thing, this files are to big to really back em up with history... I watch them... and then soon I will often delete them (from everywhere). but other parts stay... I dont delete them then... ^^
So maybe I missuse annex for that usecase... try to find that out ;)

14
doc/forum/Don__39__t_understand_how_to_delete__47__recover_files/comment_1_b307bfb0b70d649897f411eb753bd50a._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.0.60"
subject="comment 1"
date="2012-09-16T00:14:49Z"
content="""
You can use any git command you like like `git rebase` or `git revert` to operate on the links.
git-annex, like git, keeps data for files that have been deleted.
The `git annex unused` command will find that data and let you remove it. See [[walkthrough/unused_data]].
"""]]

51
doc/not/comment_4_b2a0d5a45ab8ddd66c29dde9412d7a12._comment Normal file
View file

@ -0,0 +1,51 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawn4bbuawnh-nSo9pAh8irYAcV4MQCcfdHo"
nickname="Stefan"
subject="Sparkleshare"
date="2012-09-15T01:28:05Z"
content="""
Hi,
I used sparkleshare lately in a project involving 3 computers and 2 people. and for ascii texts and even a few smaller binary things it works ok.
But it does \"to much\" for media. at least at the moment, it just uses git for saving the data. That has a possitive and a negative aspect.
possitive:
1. you have a full history, if you delete a file its not gone for ever, so if you change it, the older version is still recoverable.
2. if you would as example use it from a laptop in a train without internet and you use a git server in the internet for the central server, and would change some files, then you or somebody else would write on the same txt file as example (html or something... latex...) you would be able to merge this files.
3. its not totaly bad for backup, because you can restore old files even if you delete it localy, because it will hold all history
negative:
1. for bigger data its cracy. if you use it for movies as example, you would in git annex delete some stuff you want not to see anytime again, so you would delete it everywhere. and its really away, not beeing still there in the history
2. git as it is has issues with saving/transfairing very big files, and its slow on even mid-sized files lets say 100 5mb big files it would be slow. because at the moment sparkleshare uses git all this disatvantages are there.
3. as many clients you use lets say a projekt with 10 people, each of them have all files and all the history of this projekt/directory on their pc.
4. you need a central data-store git folder you can use a seperate pc for that or save it on a client, if you use a client for that you have to save the data double on this pc.
(so you see for big files even if git would handle them faster you would waste massivly hard disk space) but again for pdfs a few pictures text files even some office files and stuff <100mb its great and easy to do.
I try it in a few words, sparkleshare is like dropbox but with file history ( I think dropbox dont have that???) but because git is not designed (yet) for big files it works somewhat ok for < 100mb stuff if you go very much higher > 1GB it will not be optimal.
git annex dont saves the data itself in git but only the locations and the checksums. so its more like a adress book of your data. its a abstraction layer to your data, you can see on as many devises as you want even without no netzwerk internet connection active and only a very small hd see all your 5 Terrabyte of Data you might have, and move around directories sort around them... delete stuff you dont want if you can deside that by the name... and then when you come back to the connection you sync your actions and it does it to the files.
And one big feature like joey said is that you cannot partialy load files from the repos to your device if it has as example only enough space for 1/10 of it.
There is another thing, but because it is \"only\" a abstraction layer, it is theoreticaly easy to implement extentions to save your data on anything not only git repositories...
Sparkleshare will switch to something else than git, maybe but then it will switch to this single protocol and stick to that. because it does not abstract stuff so hard.
btw there is a alternative out there it forces you not to use git as vcs but you have to use a vcs (like git) and you dont have to use the client written in mono but only a smaller python script:
http://www.mayrhofer.eu.org/dvcs-autosync
but the idea behind it is the same except this 2 points ;)
but many free software developers dont like mono, so the change that it gets more love from more people is not totaly unlikely.
So way to long post but hope that helps somebody ;)
"""]]

14
doc/not/comment_5_f2829ecbe80a61aa9a8411d2403de69e._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawn4bbuawnh-nSo9pAh8irYAcV4MQCcfdHo"
nickname="Stefan"
subject="comment 5"
date="2012-09-15T01:35:06Z"
content="""
or to make it more simple ;)
sparkleshare is for proejects and maybe backup your documents folder
annex is for managing big binary files that not get modified most of the time and only added/synced or deleted.
hope thats on the point, try to start using it also now, but am a bit blowen away what it all can do and what not... and how to get a good use case, and mixing media-management with backup of home and thinking on solving that all with annex without having it used ever ;)
"""]]