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

5 files changed, 54 insertions, 1 deletions

diff --git a/doc/bugs/Assistant_redirects_to_127.0.0.1_in_some_cases__44___although_used_remotely.mdwn b/doc/bugs/Assistant_redirects_to_127.0.0.1_in_some_cases__44___although_used_remotely.mdwn
new file mode 100644
index 000000000..7480249b6
--- /dev/null
+++ b/doc/bugs/Assistant_redirects_to_127.0.0.1_in_some_cases__44___although_used_remotely.mdwn
@@ -0,0 +1,26 @@
+### Please describe the problem.
+When I use git-annex webapp with a remote IP of a headless computer,
+I am sometimes redirected to a 127.0.0.1 address (with a different
+port as well)
+
+### What steps will reproduce the problem?
+1. Install git-annex as usual.
+2. Open git-annex assistant from a headless machine and access the
+webapp with the --listen option. (e.g. git annex webapp
+--listen=xxx.yyy.zzz.www)
+3. Create your first local repository. Then create a second local
+repository.
+4. When assistant asks you if you want to merge these 2
+repositories, try to select the second option (to keep them
+separated).
+5. You are redirected from your remote IP to 127.0.0.1 to a new port number.
+
+(I also encountered the same error at another menu or function, but
+I don't remember where. Sorry.)
+
+### What version of git-annex are you using? On what operating system?
+4.20130815
+Ubuntu 13.10 64-bit (kernel 3.11.0-13-generic x86_64)
+
+### Please provide any additional information below.
+Please ask me for any additional information that may be useful.
diff --git a/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_6_5a348c5f327f16e1192ef6bd7f2880bb._comment b/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_6_5a348c5f327f16e1192ef6bd7f2880bb._comment
new file mode 100644
index 000000000..7e611cebd
--- /dev/null
+++ b/doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_6_5a348c5f327f16e1192ef6bd7f2880bb._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U"
+ nickname="Carlo"
+ subject="comment 6"
+ date="2013-11-19T09:48:26Z"
+ content="""
+Sorry, missed the comment.
+
+My work repo is the repository on my work laptop, where deletions got synced to.
+
+Git annex had then run repository repair automatically, so the odd symlinks where no longer there for me to check out.
+
+It is possible that I ran some git commands in direct mode I shouldn't have; I put the files back in and it's working nicely now. So this might have been a \"no direct mode guard\" issue.
+
+"""]]
diff --git a/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_13_571cffc0beb8ba5fc936db6971cd3d62._comment b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_13_571cffc0beb8ba5fc936db6971cd3d62._comment
new file mode 100644
index 000000000..aefe98813
--- /dev/null
+++ b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_13_571cffc0beb8ba5fc936db6971cd3d62._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="David"
+ ip="178.21.48.117"
+ subject="comment 13"
+ date="2013-11-19T09:17:26Z"
+ content="""
+Please tell me if/how I can help you. For example if you need access to servers to test...
+"""]]
diff --git a/doc/sync.mdwn b/doc/sync.mdwn
index ade34d48d..37b2b1b45 100644
--- a/doc/sync.mdwn
+++ b/doc/sync.mdwn
@@ -7,7 +7,7 @@ That works fine, if you don't mind having a central repository.
 
 But it can be harder to use git in a fully decentralized fashion, with no
 central repository and still keep repositories in sync with one another.
-You have to remember to pull from each remote, and merge the appopriate
+You have to remember to pull from each remote, and merge the appropriate
 branch after pulling. It's difficult to *push* to a remote, since git does
 not allow pushes into the currently checked out branch.
 
diff --git a/doc/todo/wishlist:_incremental_unannex___40__currently_requires_twice_the_size_of_repo_to_complete__41__.mdwn b/doc/todo/wishlist:_incremental_unannex___40__currently_requires_twice_the_size_of_repo_to_complete__41__.mdwn
new file mode 100644
index 000000000..58aa9bae2
--- /dev/null
+++ b/doc/todo/wishlist:_incremental_unannex___40__currently_requires_twice_the_size_of_repo_to_complete__41__.mdwn
@@ -0,0 +1,4 @@
+I recently tried to use unannex for a large repo and it failed because the repo size was more than half the disk size.  Unannex should work incrementally so this isn't a problem.
+
+Proposed solution:
+copy a file, hash it, iff hash check is okay, delete from objects, continue to next file