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

This commit is contained in:
Joey Hess 2014-07-11 15:53:02 -04:00
commit 003ebf58f5
6 changed files with 104 additions and 0 deletions

View file

@ -0,0 +1,42 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.2"
subject="unable to reproduce, please provide transcript"
date="2014-07-11T19:36:37Z"
content="""
I have tried to reproduce this problem on OSX, but it seems to work fine:
<pre>
oberon:xx joeyh$ git annex assistant
oberon:xx joeyh$ date > foo
oberon:xx joeyh$ git log --stat
commit 93a208c6aa0080e70a636181606f53af5f2c4441
Author: Joey Hess <joeyh@oberon.local.tam-lin.net>
Date: Fri Jul 11 15:33:50 2014 -0400
foo | 1 +
1 file changed, 1 insertion(+)
oberon:xx joeyh$ mv foo bar
oberon:xx joeyh$ git log --stat
commit 495592b2977ee96029db99761d20396577ff3c51
Author: Joey Hess <joeyh@oberon.local.tam-lin.net>
Date: Fri Jul 11 15:33:54 2014 -0400
bar | 1 +
foo | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
commit 93a208c6aa0080e70a636181606f53af5f2c4441
Author: Joey Hess <joeyh@oberon.local.tam-lin.net>
Date: Fri Jul 11 15:33:50 2014 -0400
foo | 1 +
1 file changed, 1 insertion(+)
oberon:xx joeyh$ git annex status
oberon:xx joeyh$
</pre>
> when I run git annex add on the files it says it added them but instead they still show up as ??
This must be the root of whatever the problem is, so please provide a transcript of you doing that.
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.2"
subject="comment 1"
date="2014-07-11T19:31:52Z"
content="""
I suggest following this screencast: [[videos/git-annex_assistant_lan]]
While it talks about a local network, this will also work with a server on the internet.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.2"
subject="comment 1"
date="2014-07-11T19:42:24Z"
content="""
This looks to me like the connection to Mega fails, so either they have a server down, or a network problem, or perhaps the API that the megaannex remote was relying on might have been removed..
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.2"
subject="comment 1"
date="2014-07-11T19:46:05Z"
content="""
How did you set your PATH? Note that the bash shell provides a lot of dotfiles which you can set the PATH in -- and reuses to read any single one of them when a noninteractive login is made to run a command.
It might help to install git on the NAS. It's included in the git-annex tarball, but not in a way that will put it on PATH; only in a way that will let git-annex use it.
"""]]

View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.2"
subject="comment 3"
date="2014-07-11T19:29:06Z"
content="""
The webapp certianly allows deleting repositories.
But, you can always go in and manually do it:
<pre>
git annex dead $uuid
git annex group $uuid unwanted
</pre>
"""]]

View file

@ -0,0 +1,19 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.2"
subject="comment 1"
date="2014-07-11T19:40:32Z"
content="""
61158820-db14-45b9-b9f9-8619d956388e -- [usb_papers]
This is the git remote you currently have set up.
d4456c86-fa2b-43a7-a132-027915390cf6 -- usb_papers
This is the old remote from before.
Take a look at the repository in the USB drive, and see what its annex.uuid is set to. git-annex doesn't change the UUID after a repository is set up, so the fact that you have two different UUIDs is puzzling.
If you really wanted to, you could remove the old repository from the list by running: `git annex dead d4456c86-fa2b-43a7-a132-027915390cf6`
But I would want to get to the bottom of what happened before doing that.
"""]]