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

This commit is contained in:
Joey Hess 2013-09-26 18:48:53 -04:00
commit 538910a6f9
10 changed files with 98 additions and 1 deletions

View file

@ -31,7 +31,7 @@ Here is a quick example of how to set this up, using `origin` as the remote name
On the server:
git init --bare bare-annex.git
git annex init origin
cd bare-annex.git && git annex init origin
Now configure the remote and do the initial push:

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
nickname="Richard"
subject="comment 4"
date="2013-09-26T09:08:11Z"
content="""
Fixed in http://source.git-annex.branchable.com/?p=source.git;a=commitdiff;h=98fc7e8
"""]]

View file

@ -0,0 +1 @@
I periodically move unused files to one of my servers. What I would like to do is drop any unused file that has been unused for say more than 6 months? I would like to not drop all unused files.

View file

@ -0,0 +1,21 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkeJKC5Sy0stmcTWyePOLEVv0G-x1yaT_w"
nickname="Josef"
subject="wishlist"
date="2013-09-26T11:11:19Z"
content="""
Posted the above yesterday before realizing that it should probably go to wishlist requests. I am sorry about that.
Basically it is a request to extend import options and perhaps make the options easier to use/understand.
Suggested Import Options:
- source directory,
- destination directory,
- deduplicate in annex ( yes, no )
- delete source files ( yes, no )
- trial run ( screen output only )
Many thanks for a great product!
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="ringprince"
ip="134.76.140.110"
subject="comment 2"
date="2013-09-26T06:32:48Z"
content="""
Thanks a lot. The solution with --shared was really helpful.
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawk3HGoDpnOPob5jOjvIootmkve1-nCpRiI"
nickname="Kalle"
subject="comment 5"
date="2013-09-26T06:56:49Z"
content="""
Turns out using the underlay was a piece of cake! Just mirror the folder structure of the repo in your underlaydir put your jpegs there and off you go. Images are picked up by the album plugin and it all just works. No need to coax git-annex into doing odd stuff.
Thought I'd post this for other ikiwikers.
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://id.koumbit.net/anarcat"
ip="72.0.72.144"
subject="step by step?"
date="2013-09-26T09:40:57Z"
content="""
So how does this actually work in practice? Is the underlay directory a completely disconnected repository?
Can we have step by step instructions on how to set this up?
"""]]

View file

@ -0,0 +1,17 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawk3HGoDpnOPob5jOjvIootmkve1-nCpRiI"
nickname="Kalle"
subject="comment 7"
date="2013-09-26T13:05:53Z"
content="""
@anarcat
> Can we have step by step instructions on how to set this up?
[I described the ikiwiki album setup](http://ikiwiki.info/forum/ikiwiki_with_album___38___underlay_plugins/) on the ikiwiki website as there are no git-annex tricks anymore. Just standard behaviour.
> So how does this actually work in practice? Is the underlay directory a
> completely disconnected repository?
Yes they are completely separate repos. Really the underlay dir could be managed in any way you like svn, rsync, ftp etc. I didn't expect the album plugin to pick everything up but apparently it does! Perhaps underlays are completely integrated and appear as 'normal' to all of ikiwiki?
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://id.koumbit.net/anarcat"
ip="72.0.72.144"
subject="comment 8"
date="2013-09-26T13:10:25Z"
content="""
Yes, I believe that is the way the underlay works - the files are just picked up.
As for the ikiwiki forum post - maybe you should move it to the \"tips\" section? :)
Thanks for the documentation!!
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="RaspberryPie"
ip="46.165.221.166"
subject="comment 7"
date="2013-09-26T03:46:18Z"
content="""
I see. Is there a way to check whether the build is corrupt? The build logs gave me nothing.
Anyway, XMPP is not the most important feature to me. It still bugs me though that it doesn't work when it should.
"""]]