Merge branch 'master' into sshpassword

8 files changed, 66 insertions, 0 deletions

diff --git a/doc/todo/A_Way_To_Extract_Previous_Versions_of_a_File_From_a_Direct_Repo/comment_1_6f477af942aeb98683a56bcf0e819a38._comment b/doc/todo/A_Way_To_Extract_Previous_Versions_of_a_File_From_a_Direct_Repo/comment_1_6f477af942aeb98683a56bcf0e819a38._comment
new file mode 100644
index 000000000..e97e40f62
--- /dev/null
+++ b/doc/todo/A_Way_To_Extract_Previous_Versions_of_a_File_From_a_Direct_Repo/comment_1_6f477af942aeb98683a56bcf0e819a38._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="zardoz"
+ ip="92.227.51.179"
+ subject="comment 1"
+ date="2014-05-13T20:25:22Z"
+ content="""
+I’ve added a bug on basically the same issue.
+http://git-annex.branchable.com/bugs/Revert_to_old_file_version_in_direct_mode___40__VFAT__41__/
+
+One problem is that if your direct-mode repo is on VFAT, you can’t even switch to indirect mode temporarily.
+"""]]
diff --git a/doc/todo/Enhancement:_git_annex_whereis_KEY/comment_1_5d768ab0065e6ecbc8ea25d66c226758._comment b/doc/todo/Enhancement:_git_annex_whereis_KEY/comment_1_5d768ab0065e6ecbc8ea25d66c226758._comment
new file mode 100644
index 000000000..eb60a25d3
--- /dev/null
+++ b/doc/todo/Enhancement:_git_annex_whereis_KEY/comment_1_5d768ab0065e6ecbc8ea25d66c226758._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="zardoz"
+ ip="92.227.51.179"
+ subject="comment 1"
+ date="2014-05-13T20:34:33Z"
+ content="""
+I suppose that makes sense. Is it more affordable to just retrieve the most recent filename? That would seem to be enough for many practical purposes. But I guess this would still possibly have to go through many revisions. I wonder if such a restricted search can be done by git though. Maybe using non-porcelain commands.
+"""]]
diff --git a/doc/todo/Wishlist:_disable_auto-repair_for_the_assistant.mdwn b/doc/todo/Wishlist:_disable_auto-repair_for_the_assistant.mdwn
new file mode 100644
index 000000000..972247c84
--- /dev/null
+++ b/doc/todo/Wishlist:_disable_auto-repair_for_the_assistant.mdwn
@@ -0,0 +1,3 @@
+Auto-repair takes up a lot of computing power, greatly slowing down the machine. It also still happens very often here, several times a month on different hardware, leading it to become an annoyance (and it would be easier and faster to perform manual repairs if that should be required).
+
+Therefore I'd like a setting that makes the assistant not attempt to repair on its own. Either not do anything at all, or display a message about it instead.
diff --git a/doc/todo/webapp_ssh_setup_should_work_with_locked_down_git-annex-shell_account.mdwn b/doc/todo/webapp_ssh_setup_should_work_with_locked_down_git-annex-shell_account.mdwn
new file mode 100644
index 000000000..d91bd4be5
--- /dev/null
+++ b/doc/todo/webapp_ssh_setup_should_work_with_locked_down_git-annex-shell_account.mdwn
@@ -0,0 +1,7 @@
+When the webapp is used to set up a ssh repository, it should detect if
+there is already a repository, and sshing in to the server forces running
+git-annex-shell (perhaps by it being set to the user's login shell). 
+
+In this case it should just use the already set up repository. Note that
+it would not be possible to add a new repository on the server using only
+git-annex-shell. --[[Joey]]
diff --git a/doc/todo/windows_support/comment_11_c3af14453e99dae5425deaa26ca7310e._comment b/doc/todo/windows_support/comment_11_c3af14453e99dae5425deaa26ca7310e._comment
new file mode 100644
index 000000000..83e2ba514
--- /dev/null
+++ b/doc/todo/windows_support/comment_11_c3af14453e99dae5425deaa26ca7310e._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawm9ocq1Kb0WL-cz-LPpvd2Xm-q8tIQvqXA"
+ nickname="Dominik"
+ subject="running as service"
+ date="2014-05-13T17:40:57Z"
+ content="""
+Hey, just tried git-annex on windows. Love the idea, but the windows port still seems to be a work in progress. I thought I'd check in here and see if i could help. Maybe this is a start:
+
+You can setup any executable file as a windows service using Sc.exe included in the Windows Resource Kit.
+https://support.microsoft.com/kb/251192?SmcNavTabIndex=1
+Its pretty easy and straightforward 
+
+Another option would be installing the service using nsis, here is one possible plugin that should do the trick: http://nsis.sourceforge.net/NSIS_Simple_Service_Plugin
+"""]]
diff --git a/doc/todo/wishlist:___96__git_annex_sync__96___without_auto-commit.mdwn b/doc/todo/wishlist:___96__git_annex_sync__96___without_auto-commit.mdwn
new file mode 100644
index 000000000..b7a7865c8
--- /dev/null
+++ b/doc/todo/wishlist:___96__git_annex_sync__96___without_auto-commit.mdwn
@@ -0,0 +1,5 @@
+I would like to have way, ideally a per-repo-cloud setting which syncs around automatically, to not have `git annex sync` autocommit staged additions.
+
+I often have quite complex additions with a mix of `git add` and `git annex add` in various stages of completion; running `git annex sync` regularly to see what state the other repos are in should not autocommit if possible.
+
+Richard
diff --git a/doc/todo/wishlist:___96__git_annex_sync__96___without_auto-commit/comment_1_fff7cdff9e4bc988139152a799b65c99._comment b/doc/todo/wishlist:___96__git_annex_sync__96___without_auto-commit/comment_1_fff7cdff9e4bc988139152a799b65c99._comment
new file mode 100644
index 000000000..1e455c486
--- /dev/null
+++ b/doc/todo/wishlist:___96__git_annex_sync__96___without_auto-commit/comment_1_fff7cdff9e4bc988139152a799b65c99._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="zardoz"
+ ip="92.227.51.179"
+ subject="comment 1"
+ date="2014-05-13T20:23:11Z"
+ content="""
+This could be particularly useful for direct-mode repositories.
+"""]]
diff --git a/doc/todo/wishlist:___96__git_annex_sync__96___without_auto-commit/comment_2_b8dd92d7710a9d194312058e53c38d21._comment b/doc/todo/wishlist:___96__git_annex_sync__96___without_auto-commit/comment_2_b8dd92d7710a9d194312058e53c38d21._comment
new file mode 100644
index 000000000..cc6cd727b
--- /dev/null
+++ b/doc/todo/wishlist:___96__git_annex_sync__96___without_auto-commit/comment_2_b8dd92d7710a9d194312058e53c38d21._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="zardoz"
+ ip="92.227.51.179"
+ subject="comment 2"
+ date="2014-05-13T20:27:38Z"
+ content="""
+I filed a bug today, which boils down to a related issue.
+
+http://git-annex.branchable.com/bugs/git_annex_list__47__whereis_and_uncommited_local_changes/
+"""]]