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

9 files changed, 74 insertions, 2 deletions

diff --git a/doc/bugs/Share_with_friends_crash_in_osx/comment_2_f1fe0c05724236988e77f4b7f393e7d5._comment b/doc/bugs/Share_with_friends_crash_in_osx/comment_2_f1fe0c05724236988e77f4b7f393e7d5._comment
new file mode 100644
index 000000000..1131f74a1
--- /dev/null
+++ b/doc/bugs/Share_with_friends_crash_in_osx/comment_2_f1fe0c05724236988e77f4b7f393e7d5._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkLdR1fuu5aEz3s9VKTBKVMize_SmeNRJM"
+ nickname="David"
+ subject="Different Crash on startup"
+ date="2014-01-14T22:40:26Z"
+ content="""
+dyld: Library not loaded: /usr/local/opt/libxml2/lib/libxml2.2.dylib
+  Referenced from: /Applications/git-annex.app/Contents/MacOs/bundle/git-annex
+  Reason: Incompatible library version: git-annex requires version 12.0.0 or later, but libxml2.2.dylib provides version 10.0.0
+
+I think the problem at this point is I don't have brew installed though.  I'll try to do that later tonight.
+"""]]
diff --git a/doc/bugs/Share_with_friends_crash_in_osx/comment_3_3d9ec79231e1b340b5e8b7b63a902546._comment b/doc/bugs/Share_with_friends_crash_in_osx/comment_3_3d9ec79231e1b340b5e8b7b63a902546._comment
new file mode 100644
index 000000000..d11cf6b77
--- /dev/null
+++ b/doc/bugs/Share_with_friends_crash_in_osx/comment_3_3d9ec79231e1b340b5e8b7b63a902546._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawn_3tllXjSmtgm__aGr9Z4gVNFgJgGyJ30"
+ nickname="David Alan"
+ subject="Partly fixed?"
+ date="2014-01-15T01:35:19Z"
+ content="""
+The new build fixed it for me on Mac OS 10.8.5 but not on 10.9.1
+Using the app, it won't start anything on 10.9.1 now.
+"""]]
diff --git a/doc/bugs/Share_with_friends_crash_in_osx/comment_4_f63bb1d29fc7130bfa0c15feeba4e5fd._comment b/doc/bugs/Share_with_friends_crash_in_osx/comment_4_f63bb1d29fc7130bfa0c15feeba4e5fd._comment
new file mode 100644
index 000000000..e76fecc3c
--- /dev/null
+++ b/doc/bugs/Share_with_friends_crash_in_osx/comment_4_f63bb1d29fc7130bfa0c15feeba4e5fd._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkLdR1fuu5aEz3s9VKTBKVMize_SmeNRJM"
+ nickname="David"
+ subject="comment 4"
+ date="2014-01-15T02:21:38Z"
+ content="""
+The problem on 10.9.1 appears to be related to the version of libxml2 thats being used. There is a console message on startup that shows this:
+    
+    dyld: Library not loaded: /usr/local/opt/libxml2/lib/libxml2.2.dylib
+      Referenced from: /Applications/git-annex.app/Contents/MacOs/bundle/git-annex
+      Reason: Incompatible library version: git-annex requires version 12.0.0 or later, but libxml2.2.dylib provides version 10.0.0
+    
+ I have actually been unable to build the newest version of libxml2 which I guess will have a library version 12 on mavericks so far tonight via Brew.  I keep getting errors like:
+
+    /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/sys/_types.h:132:9: error: unknown type name '__int32_t'
+    typedef __int32_t       __darwin_suseconds_t;   /* [???] microseconds */
+
+So far the interwebs are failing me and I don't have a solution.  
+"""]]
diff --git a/doc/bugs/assistant_eats_all_CPU/comment_9_1c129c924ef3a4a594de6580cf4224c7._comment b/doc/bugs/assistant_eats_all_CPU/comment_9_1c129c924ef3a4a594de6580cf4224c7._comment
new file mode 100644
index 000000000..f5c5d2749
--- /dev/null
+++ b/doc/bugs/assistant_eats_all_CPU/comment_9_1c129c924ef3a4a594de6580cf4224c7._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ ip="2001:1928:1:9::1"
+ subject="comment 9"
+ date="2014-01-15T04:29:55Z"
+ content="""
+I have upgraded to the 3.10 backport, and there was no change in this behavior. I still see unreasonable CPU usage.
+
+    Linux marcos 3.10-0.bpo.3-amd64 #1 SMP Debian 3.10.11-1~bpo70+1 (2013-09-24) x86_64 GNU/Linux
+
+"""]]
diff --git a/doc/devblog/day_98__old_bug.mdwn b/doc/devblog/day_98__old_bug.mdwn
index ccd2072d2..565efbdbc 100644
--- a/doc/devblog/day_98__old_bug.mdwn
+++ b/doc/devblog/day_98__old_bug.mdwn
@@ -7,11 +7,11 @@ at last. (I'm pretty sure the code would have never had this bug if
 Data.AssocList was not buried inside an xml library, which rather
 discourages using it when dealing with the environment.)
 
-Also worked on, and hopefully fixed anther OSX cpu optimisations problem.
+Also worked on, and hopefully fixed, another OSX cpu optimisations problem.
 This one involving shared libraries that git-annex uses for XMPP.
 
 Also made the assistant detect corrupt .git/annex/index files on startup
-and remove them. It already was able to recover from corrupt .git/index
+and remove them. It was already able to recover from corrupt .git/index
 files.
 
 Today's work was sponsored by David Wagner.
diff --git a/doc/forum/Can__39__t_get_jabber_working/comment_3_852dc402a286e38b77b99f174c33f8d1._comment b/doc/forum/Can__39__t_get_jabber_working/comment_3_852dc402a286e38b77b99f174c33f8d1._comment
new file mode 100644
index 000000000..251047f26
--- /dev/null
+++ b/doc/forum/Can__39__t_get_jabber_working/comment_3_852dc402a286e38b77b99f174c33f8d1._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawn_3tllXjSmtgm__aGr9Z4gVNFgJgGyJ30"
+ nickname="David Alan"
+ subject="Yes"
+ date="2014-01-15T01:41:12Z"
+ content="""
+Will put future comments there. Thanks you.
+"""]]
diff --git a/doc/todo/dont_append_:5222_to_jabber_hosts__44___if_a_different_port_has_been_specified_already.mdwn b/doc/todo/dont_append_:5222_to_jabber_hosts__44___if_a_different_port_has_been_specified_already.mdwn
new file mode 100644
index 000000000..257054a90
--- /dev/null
+++ b/doc/todo/dont_append_:5222_to_jabber_hosts__44___if_a_different_port_has_been_specified_already.mdwn
@@ -0,0 +1,2 @@
+
+While trying so establish a jabber link via a server that runs a nonstandard port I came across the problem that git-annex always appends :5222 to the jabber server address. This effectively stops the connection procedure at a point where it does not need to.
diff --git a/doc/todo/wishlist:_more_info_in_commit_messages_in_general.mdwn b/doc/todo/wishlist:_more_info_in_commit_messages_in_general.mdwn
new file mode 100644
index 000000000..5b923ebcb
--- /dev/null
+++ b/doc/todo/wishlist:_more_info_in_commit_messages_in_general.mdwn
@@ -0,0 +1,3 @@
+This is probably an extension of [[wishlist: more info in the standard commit message of `sync`]]:
+
+It would also help debugging if the default commit messages listed, e.g., the name of all the files modified by that commit (or merge).
diff --git a/doc/todo/wishlist:_more_info_in_the_standard_commit_message_of___96__sync__96__/comment_1_b9c241cf94a35aa6a45f4d44334694b0._comment b/doc/todo/wishlist:_more_info_in_the_standard_commit_message_of___96__sync__96__/comment_1_b9c241cf94a35aa6a45f4d44334694b0._comment
new file mode 100644
index 000000000..bede77efc
--- /dev/null
+++ b/doc/todo/wishlist:_more_info_in_the_standard_commit_message_of___96__sync__96__/comment_1_b9c241cf94a35aa6a45f4d44334694b0._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://olivier.mehani.name/"
+ nickname="olivier-mehani"
+ subject="comment 1"
+ date="2014-01-15T02:26:31Z"
+ content="""
+See also [[wishlist: more info in commit messages in general]] for a similar but more generic wish.
+"""]]