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 2012-09-17 22:37:23 -04:00
commit e6d4108fad
3 changed files with 36 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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 13 "Amazon S3" 5 "Box.com" 40 "My phone (or MP3 player)" 2 "Tahoe-LAFS" 3 "OpenStack SWIFT" 9 "Google Drive" 7 "Amazon Glacier"]]
[[!poll open=yes 13 "Amazon S3" 5 "Box.com" 41 "My phone (or MP3 player)" 2 "Tahoe-LAFS" 3 "OpenStack SWIFT" 10 "Google Drive" 7 "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

14
doc/forum/Don__39__t_understand_how_to_delete__47__recover_files/comment_6_1759bcd5708f591f91b9c410f6dc5c54._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 6"
date="2012-09-17T23:00:09Z"
content="""
ok I now at least got it that it is nice to run watch on both repositories...
but what I dont get is, is the git annex watch commando not a automatic way so that this deamon makes sync command whenever needed? so I have to use git annex sync first on the repos where I delete the file and then again on the repos I want to receive that change... that seemed to work, but why did watch not do that for me???
"""]]

21
doc/forum/Don__39__t_understand_how_to_delete__47__recover_files/comment_7_2a389f01eb5131042ea1e71a73c9787a._comment Normal file
View file

@ -0,0 +1,21 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawn4bbuawnh-nSo9pAh8irYAcV4MQCcfdHo"
nickname="Stefan"
subject="comment 7"
date="2012-09-18T00:11:50Z"
content="""
cd /mnt/data/annex/ &&
/usr/bin/git annex sync &&
/usr/bin/git annex copy --auto --to usbdrive &&
cd /mnt/usb1/annex/ &&
/usr/bin/git annex sync &&
echo \"synced\" ||
echo \"backup of annex failed\" | sendxmpp -t name@server.country
ok suprisingly that did not only sync the files but also did remove the file, so you dont need a pull... dont know what I did wrong the other times I tried, does maybe the copy command also \"copies\" the delete commit?
but annyway that works for me... (for now I do the dropunused command manuelly...)
that should work as cronjob...
"""]]