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-07-30 19:19:30 -04:00
commit 433682cb1d
5 changed files with 49 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
doc/bugs/Watcher_crashed_in_Android_on___47__storage__47__sdcard1_-_bug__63__/comment_3_0f7cc02e0193c969c9b6ceb27e71af8a._comment Normal file
View file

@ -0,0 +1,20 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y"
nickname="Nigel"
subject="/storage/sdcard1/.git/annex/daemon.log"
date="2013-07-30T23:11:29Z"
content="""
[2013-07-30 23:17:43 BST] main: starting assistant version 4.20130723-ged05a63
(scanning...) [2013-07-30 23:17:44 BST] Watcher: Performing startup scan
Watcher crashed: addWatch: permission denied (Permission denied)
[2013-07-30 23:17:45 BST] Watcher: warning Watcher crashed: addWatch: permission denied (Permission denied)
[2013-07-30 23:17:45 BST] Committer: Adding 229286 229381
add LOST.DIR/229286 (checksum...) ok
add LOST.DIR/229381 (checksum...) [2013-07-30 23:17:47 BST] Committer: Committing changes to git
[2013-07-30 23:20:22 BST] Committer: Adding git-annex..stall.log
ok
(Recording state in git...)
(Recording state in git...)
add git-annex-install.log (checksum...) ok
add git-annex-install.log (checksum...) [2013-07-30 23:20:22 BST] Committer: Committing changes to git
"""]]

8
doc/install/Fedora/comment_3_d872acf8865fe7c99a9b712db5b38ea4._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.0.21"
subject="comment 3"
date="2013-07-30T21:25:32Z"
content="""
Edit Utility/Url.hs and play around with the version in the `MIN_VERSION_network` define. It seems to me that your system needs to build with the #else branch of the #ifdef, despite having a version of the haskell network package older than 2.4.0. It's possible that the haskell network package has been modified by Fedora.
"""]]

2
doc/tips/downloading_podcasts.mdwn
View file

@ -59,5 +59,5 @@ You can also have a designated machine which always fetches all podcstas
to local disk and stores them. That way, you can archive podcasts with
time-delayed deletion of upstream content. You can also work around slow
downloads upstream by podcatching to a server with ample bandwidth or work
around a slow local Internet connection by podcatching to yuor home server
around a slow local Internet connection by podcatching to your home server
and transferring to your laptop on demand.

10
doc/tips/downloading_podcasts/comment_3_5a8068a5cb0fd864581157a3aa5d1113._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://www.joachim-breitner.de/"
nickname="nomeata"
subject="Great stuff!"
date="2013-07-30T21:21:57Z"
content="""
Looking forward to seeing it in Debian unstable; where it will definitely replace my hpodder setup.
I guess there is no easy way to re-use the files already downloaded with hpodder? At first I thought that `git annex importfeed --relaxed` followed by adding the files to the git annex would work, but `importfeed` stores URLs, not content-based hashes, so it wouldn’t match up.
"""]]

10
doc/tips/downloading_podcasts/comment_4_e7072a9da30b4c4b4c526013144238d4._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.0.21"
subject="comment 4"
date="2013-07-30T21:29:50Z"
content="""
@nomeata, well, you can, but it has to download the files again.
When run without --fast, `importfeed` does use content based hashes, so if you run it in a temporary directory, it will download the content redundantly, hash it and see it's the same, and add the url to that hash. You can then delete the temporary directory, and the files hpodder had downloaded will have the url attached to them now. I don't know if this really buys you anything over deleting the hpodder files and starting over though.
"""]]