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

8 files changed, 112 insertions, 0 deletions

diff --git a/doc/bugs/rename:_permission_denied__44___after_direct_mode_switch/comment_4_abffe1fb3b3e684b126e4768089dc5f4._comment b/doc/bugs/rename:_permission_denied__44___after_direct_mode_switch/comment_4_abffe1fb3b3e684b126e4768089dc5f4._comment
new file mode 100644
index 000000000..890648d16
--- /dev/null
+++ b/doc/bugs/rename:_permission_denied__44___after_direct_mode_switch/comment_4_abffe1fb3b3e684b126e4768089dc5f4._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.87"
+ subject="comment 4"
+ date="2013-12-12T20:17:26Z"
+ content="""
+It looks like the symlink may have some form of immutable attribute set on it. I assume that the \"uchg\" in the ls output means something like \"unchangable\".
+"""]]
diff --git a/doc/forum/dot_git_slash_annex_slash_tmp/comment_13_35ae9d6bcb8d9762a92e3564b686ed72._comment b/doc/forum/dot_git_slash_annex_slash_tmp/comment_13_35ae9d6bcb8d9762a92e3564b686ed72._comment
new file mode 100644
index 000000000..0cbeb8f5e
--- /dev/null
+++ b/doc/forum/dot_git_slash_annex_slash_tmp/comment_13_35ae9d6bcb8d9762a92e3564b686ed72._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.87"
+ subject="comment 13"
+ date="2013-12-12T20:01:09Z"
+ content="""
+The people who are apparently still having this problem need to provide details about the names of the files in the temp directory. Otherwise, I cannot fix whatever problem you are encountering.
+"""]]
diff --git a/doc/forum/local_pairing_with_2_mac/comment_2_7c2b3d0a8a69c7056508f8ec73ebefcd._comment b/doc/forum/local_pairing_with_2_mac/comment_2_7c2b3d0a8a69c7056508f8ec73ebefcd._comment
new file mode 100644
index 000000000..03b06e45a
--- /dev/null
+++ b/doc/forum/local_pairing_with_2_mac/comment_2_7c2b3d0a8a69c7056508f8ec73ebefcd._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnfC02DTOZygFDDvvg0maRciYYMhEIFgkw"
+ nickname="Utku"
+ subject="comment 2"
+ date="2013-12-12T20:08:50Z"
+ content="""
+hello
+both computers are on mac os maverick
+latest version of git annex, and we used the git annex assistant dmg found on the install section...
+I am on a personnal home router so I don't think there is any port that might be blocked by a firewall for local connections...
+
+ 
+"""]]
diff --git a/doc/forum/local_pairing_with_2_mac/comment_3_07fa468aac1288e770487973052bccea._comment b/doc/forum/local_pairing_with_2_mac/comment_3_07fa468aac1288e770487973052bccea._comment
new file mode 100644
index 000000000..bab5009f4
--- /dev/null
+++ b/doc/forum/local_pairing_with_2_mac/comment_3_07fa468aac1288e770487973052bccea._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.87"
+ subject="comment 3"
+ date="2013-12-12T20:37:55Z"
+ content="""
+It's not a firewall or network problem, what you pasted earlier shows that the ssh-keygen command bundled in the git annex dmg is trying to use a symbol that is not present in your libSystem library.
+
+I am puzzled why ssh-keygen apparently works on one of your macs and not on the other, if they indeed both have the same build of git-annex installed.
+
+Please paste output of `otool -L /Applications/git-annex.app/Contents/MacOS/bundle/ssh-keygen` on the mac with the problem.
+"""]]
diff --git a/doc/forum/local_pairing_with_2_mac/comment_4_dc0494213d2b57b5b9a489b096a5b8d0._comment b/doc/forum/local_pairing_with_2_mac/comment_4_dc0494213d2b57b5b9a489b096a5b8d0._comment
new file mode 100644
index 000000000..f3f25504a
--- /dev/null
+++ b/doc/forum/local_pairing_with_2_mac/comment_4_dc0494213d2b57b5b9a489b096a5b8d0._comment
@@ -0,0 +1,31 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnfC02DTOZygFDDvvg0maRciYYMhEIFgkw"
+ nickname="Utku"
+ subject="comment 4"
+ date="2013-12-12T20:58:05Z"
+ content="""
+so as I don't really know which mac has a problem, here is what I get on both computers (looks they are quite the same): 
+
+/Applications/git-annex.app/Contents/MacOS/bundle/ssh-keygen:
+	/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation (compatibility version 150.0.0, current version 855.0.0)
+	/System/Library/Frameworks/Kerberos.framework/Versions/A/Kerberos (compatibility version 5.0.0, current version 6.0.0)
+	/System/Library/Frameworks/OpenDirectory.framework/Versions/A/OpenDirectory (compatibility version 1.0.0, current version 1.0.0)
+	/System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 55456.0.0)
+	@executable_path/O (compatibility version 1.0.0, current version 1.0.0)
+	@executable_path/P (compatibility version 3.0.0, current version 3.0.0)
+	@executable_path/B (compatibility version 1.0.0, current version 1.2.5)
+	@executable_path/L (compatibility version 1.0.0, current version 1.0.0)
+	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1197.1.1)
+
+
+/Applications/git-annex.app/Contents/MacOS/bundle/ssh-keygen:
+       /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation (compatibility version 150.0.0, current version 855.0.0)
+       /System/Library/Frameworks/Kerberos.framework/Versions/A/Kerberos (compatibility version 5.0.0, current version 6.0.0)
+       /System/Library/Frameworks/OpenDirectory.framework/Versions/A/OpenDirectory (compatibility version 1.0.0, current version 1.0.0)
+       /System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 55456.0.0)
+       @executable_path/O (compatibility version 1.0.0, current version 1.0.0)
+       @executable_path/P (compatibility version 3.0.0, current version 3.0.0)
+       @executable_path/B (compatibility version 1.0.0, current version 1.2.5)
+       @executable_path/L (compatibility version 1.0.0, current version 1.0.0)
+       /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1197.1.1)
+"""]]
diff --git a/doc/forum/s3_vs_ssh_Performance_Problems/comment_4_f9c3ef3b1b44bfb29125acb6ec621f38._comment b/doc/forum/s3_vs_ssh_Performance_Problems/comment_4_f9c3ef3b1b44bfb29125acb6ec621f38._comment
new file mode 100644
index 000000000..2e4cda634
--- /dev/null
+++ b/doc/forum/s3_vs_ssh_Performance_Problems/comment_4_f9c3ef3b1b44bfb29125acb6ec621f38._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.87"
+ subject="comment 4"
+ date="2013-12-12T20:14:01Z"
+ content="""
+You mentioned something about high memory usage when copying. How much memory are we talking about?
+
+Have you run `git annex forget` in this repository before? It kind of sounds like you have, and it might be possible that it's repeatedly trying to forget old history for some reason.
+"""]]
diff --git a/doc/forum/unsynced_folder/comment_1_7d7a262f067c7b02d76e82637223934c._comment b/doc/forum/unsynced_folder/comment_1_7d7a262f067c7b02d76e82637223934c._comment
new file mode 100644
index 000000000..7f746df12
--- /dev/null
+++ b/doc/forum/unsynced_folder/comment_1_7d7a262f067c7b02d76e82637223934c._comment
@@ -0,0 +1,22 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.87"
+ subject="comment 1"
+ date="2013-12-12T20:09:48Z"
+ content="""
+Sorry I took so long to answer. I think that it took me a few tries to understand your question.
+
+You want to have a special folder on a single clone of a repository, and be able to move files to that folder from the archive folder, and have it get the file content from the archive repository. But you don't want that file content to spread to any of the other repositories.
+
+This is possible to do by writing a custom [[preferred_content]] expression, and configuring the repository to use it. For simplicity, let's make the folder be called `archive/local`. This way, all the clients that do not use this preferred content expression will see that the file is still under the archive folder, and not want its content.
+
+Now we can take the preferred content expression used by client repositories normally:
+
+  ((exclude=*/archive/* and exclude=archive/*) or (not (copies=archive:1 or copies=smallarchive:1))) or (not copies=semitrusted+:1)
+
+And modify it:
+
+  ((exclude=*/archive/* and exclude=archive/* and (not */archive/local/*) and (not archive/local/*)) or (not (copies=archive:1 or copies=smallarchive:1))) or (not copies=semitrusted+:1)
+
+You can use `git annex vifg` to edit the preferred content expressions, and paste that in. Should work. Untested.
+"""]]
diff --git a/doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant/comment_11_54692ebf854ecbcc5314bb29c33ecc66._comment b/doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant/comment_11_54692ebf854ecbcc5314bb29c33ecc66._comment
new file mode 100644
index 000000000..cc48eca66
--- /dev/null
+++ b/doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant/comment_11_54692ebf854ecbcc5314bb29c33ecc66._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.87"
+ subject="comment 11"
+ date="2013-12-12T19:58:53Z"
+ content="""
+The abovementioned bug is fixed in git, and will be in a release tomorrow.
+"""]]