diff options
author | 2014-07-11 15:53:02 -0400 | |
---|---|---|
committer | 2014-07-11 15:53:02 -0400 | |
commit | 64b74f4c616bd1aa42e7833b449586b64dac1ba5 (patch) | |
tree | ecf009508a768f29a675c930f1d945fb35943980 | |
parent | 65d8cf68ff9a070471f6db2590dfce1dbed3aeca (diff) | |
parent | 9ced56c8c0f860a37b29bb353ae38ce5d76f90c5 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
6 files changed, 104 insertions, 0 deletions
diff --git a/doc/bugs/Moved_files_are_not_picked_up_by_the_assistant_on_OS_X/comment_1_75c14b405929a8f771a7c261dcc4b7a2._comment b/doc/bugs/Moved_files_are_not_picked_up_by_the_assistant_on_OS_X/comment_1_75c14b405929a8f771a7c261dcc4b7a2._comment new file mode 100644 index 000000000..5346cb949 --- /dev/null +++ b/doc/bugs/Moved_files_are_not_picked_up_by_the_assistant_on_OS_X/comment_1_75c14b405929a8f771a7c261dcc4b7a2._comment @@ -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. +"""]] diff --git a/doc/forum/Best_approach_for_central_sharing_and_multiple_users/comment_1_48ffb50b92588daec6887bf08f1b97f5._comment b/doc/forum/Best_approach_for_central_sharing_and_multiple_users/comment_1_48ffb50b92588daec6887bf08f1b97f5._comment new file mode 100644 index 000000000..17860d037 --- /dev/null +++ b/doc/forum/Best_approach_for_central_sharing_and_multiple_users/comment_1_48ffb50b92588daec6887bf08f1b97f5._comment @@ -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. +"""]] diff --git a/doc/forum/MegaAnnex_not_working./comment_1_5aa3fd366d4c78ca79bb58005a49791c._comment b/doc/forum/MegaAnnex_not_working./comment_1_5aa3fd366d4c78ca79bb58005a49791c._comment new file mode 100644 index 000000000..c2e7353db --- /dev/null +++ b/doc/forum/MegaAnnex_not_working./comment_1_5aa3fd366d4c78ca79bb58005a49791c._comment @@ -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.. +"""]] diff --git a/doc/forum/Ssh_remote_on_NAS/comment_1_1dd8a0d0e70a1fb36fce62e89c99b404._comment b/doc/forum/Ssh_remote_on_NAS/comment_1_1dd8a0d0e70a1fb36fce62e89c99b404._comment new file mode 100644 index 000000000..6563a9bb6 --- /dev/null +++ b/doc/forum/Ssh_remote_on_NAS/comment_1_1dd8a0d0e70a1fb36fce62e89c99b404._comment @@ -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. +"""]] diff --git a/doc/forum/USB_drive_in_transfer_group_keeps_growing_-_assistant/comment_3_7fb74f7fab6c1baff4ffc270cf15ef0a._comment b/doc/forum/USB_drive_in_transfer_group_keeps_growing_-_assistant/comment_3_7fb74f7fab6c1baff4ffc270cf15ef0a._comment new file mode 100644 index 000000000..df8333cb3 --- /dev/null +++ b/doc/forum/USB_drive_in_transfer_group_keeps_growing_-_assistant/comment_3_7fb74f7fab6c1baff4ffc270cf15ef0a._comment @@ -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> +"""]] diff --git a/doc/forum/ghost_semitrusted_repositories/comment_1_99bea1a964da9c5603b8cfbdc19bcde8._comment b/doc/forum/ghost_semitrusted_repositories/comment_1_99bea1a964da9c5603b8cfbdc19bcde8._comment new file mode 100644 index 000000000..ced8645e2 --- /dev/null +++ b/doc/forum/ghost_semitrusted_repositories/comment_1_99bea1a964da9c5603b8cfbdc19bcde8._comment @@ -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. +"""]] |