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

8 files changed, 129 insertions, 0 deletions

diff --git a/doc/assistant/release_notes/comment_3_b3bfd8e547e20c51f7c32c6c9424e936._comment b/doc/assistant/release_notes/comment_3_b3bfd8e547e20c51f7c32c6c9424e936._comment
new file mode 100644
index 000000000..73377c714
--- /dev/null
+++ b/doc/assistant/release_notes/comment_3_b3bfd8e547e20c51f7c32c6c9424e936._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.252.11.120"
+ subject="comment 3"
+ date="2012-11-13T17:11:51Z"
+ content="""
+This has been previously reported: [[bugs/OSX_git-annex.app_error:__LSOpenURLsWithRole()]]
+
+No clue what that error is supposed to mean. 
+"""]]
diff --git a/doc/bugs/Install_of_git-annex-3.20121112_fails/comment_1_80fc80151d4390bd8a4332f30723962e._comment b/doc/bugs/Install_of_git-annex-3.20121112_fails/comment_1_80fc80151d4390bd8a4332f30723962e._comment
new file mode 100644
index 000000000..b3889eca6
--- /dev/null
+++ b/doc/bugs/Install_of_git-annex-3.20121112_fails/comment_1_80fc80151d4390bd8a4332f30723962e._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.252.11.120"
+ subject="comment 1"
+ date="2012-11-13T17:08:14Z"
+ content="""
+You forgot to say how it fails.
+"""]]
diff --git a/doc/bugs/Install_of_git-annex-3.20121112_fails/comment_2_2613320a41a74dc757a3277c8c328bd0._comment b/doc/bugs/Install_of_git-annex-3.20121112_fails/comment_2_2613320a41a74dc757a3277c8c328bd0._comment
new file mode 100644
index 000000000..fa2b326e9
--- /dev/null
+++ b/doc/bugs/Install_of_git-annex-3.20121112_fails/comment_2_2613320a41a74dc757a3277c8c328bd0._comment
@@ -0,0 +1,62 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnldTTAP8PAifJUmqhRar6RAWNWlRcencw"
+ nickname="Marco"
+ subject="The failure"
+ date="2012-11-13T17:24:40Z"
+ content="""
+Configuring certificate-1.2.2...
+Building certificate-1.2.2...
+Preprocessing library certificate-1.2.2...
+[1 of 9] Compiling Data.Certificate.KeyRSA ( Data/Certificate/KeyRSA.hs, dist/build/Data/Certificate/KeyRSA.o )
+
+Data/Certificate/KeyRSA.hs:29:27:
+    Constructor `RSA.PrivateKey' does not have field `RSA.private_size'
+    In the expression:
+      RSA.PrivateKey
+        {RSA.private_size = calculate_modulus p_modulus 1,
+         RSA.private_n = p_modulus, RSA.private_d = priv_exp,
+         RSA.private_p = p_p1, RSA.private_q = p_p2,
+         RSA.private_dP = p_exp1, RSA.private_dQ = p_exp2,
+         RSA.private_qinv = p_coef}
+    In an equation for `privkey':
+        privkey
+          = RSA.PrivateKey
+              {RSA.private_size = calculate_modulus p_modulus 1,
+               RSA.private_n = p_modulus, RSA.private_d = priv_exp,
+               RSA.private_p = p_p1, RSA.private_q = p_p2,
+               RSA.private_dP = p_exp1, RSA.private_dQ = p_exp2,
+               RSA.private_qinv = p_coef}
+    In an equation for `parsePrivate':
+        parsePrivate
+          [Start Sequence,
+           IntVal 0,
+           IntVal p_modulus,
+           IntVal pub_exp,
+           IntVal priv_exp,
+           IntVal p_p1,
+           IntVal p_p2,
+           IntVal p_exp1,
+           IntVal p_exp2,
+           IntVal p_coef,
+           End Sequence]
+          = Right (pubkey, privkey)
+          where
+              privkey
+                = RSA.PrivateKey
+                    {RSA.private_size = calculate_modulus p_modulus 1,
+                     RSA.private_n = p_modulus, RSA.private_d = priv_exp,
+                     RSA.private_p = p_p1, RSA.private_q = p_p2,
+                     RSA.private_dP = p_exp1, RSA.private_dQ = p_exp2,
+                     RSA.private_qinv = p_coef}
+              pubkey
+                = RSA.PublicKey
+                    {RSA.public_size = calculate_modulus p_modulus 1,
+                     RSA.public_n = p_modulus, RSA.public_e = pub_exp}
+              calculate_modulus n i
+                = if (2 ^ (i * 8)) > n then i else calculate_modulus n (i + 1)
+cabal: Error: some packages failed to install:
+authenticate-1.3.2 depends on certificate-1.2.2 which failed to install.
+certificate-1.2.2 failed during the building phase. The exception was:
+ExitFailure 1
+git-annex-3.20121112 depends on certificate-1.2.2 which failed to install.
+"""]]
diff --git a/doc/bugs/Is_there_any_way_to_rate_limit_uploads_to_an_S3_backend__63__/comment_2_539b89de8743e435386b86119d1e982f._comment b/doc/bugs/Is_there_any_way_to_rate_limit_uploads_to_an_S3_backend__63__/comment_2_539b89de8743e435386b86119d1e982f._comment
new file mode 100644
index 000000000..122bafbba
--- /dev/null
+++ b/doc/bugs/Is_there_any_way_to_rate_limit_uploads_to_an_S3_backend__63__/comment_2_539b89de8743e435386b86119d1e982f._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.252.11.120"
+ subject="comment 2"
+ date="2012-11-13T17:09:31Z"
+ content="""
+It's not there yet. I don't think it will be hard to add, most of the same things need to be done to support upload progress bars with S3.
+"""]]
diff --git a/doc/bugs/using_old_remote_format_generates_irritating_output/comment_2_416992874813f120721a56d88b2bef65._comment b/doc/bugs/using_old_remote_format_generates_irritating_output/comment_2_416992874813f120721a56d88b2bef65._comment
new file mode 100644
index 000000000..1dfd0bde7
--- /dev/null
+++ b/doc/bugs/using_old_remote_format_generates_irritating_output/comment_2_416992874813f120721a56d88b2bef65._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.252.11.120"
+ subject="comment 2"
+ date="2012-11-13T17:27:31Z"
+ content="""
+So, I don't know how to suppress this message without causing worse problems, like suppressing real error messages, and even password prompts.
+
+"""]]
diff --git a/doc/forum/Default_text__47__html_handler/comment_1_4730061916c7e12b7a41906152f847ee._comment b/doc/forum/Default_text__47__html_handler/comment_1_4730061916c7e12b7a41906152f847ee._comment
new file mode 100644
index 000000000..e2424f1cc
--- /dev/null
+++ b/doc/forum/Default_text__47__html_handler/comment_1_4730061916c7e12b7a41906152f847ee._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.252.11.120"
+ subject="comment 1"
+ date="2012-11-13T17:25:07Z"
+ content="""
+Not without exposing the secret token to other users in the system by passing it as a parameter to the browser command. Which is why it uses the method it does.
+
+But, you can configure it to use a specific browser in the standard git way:
+
+git config web.browser chromium
+"""]]
diff --git a/doc/forum/XMPP_email_setup_says_wrong_password_but_it__39__s_correct._Can_I_provide_some_kind_of_debug_data__63__/comment_2_16994dc86b87592fc62799e2d206d172._comment b/doc/forum/XMPP_email_setup_says_wrong_password_but_it__39__s_correct._Can_I_provide_some_kind_of_debug_data__63__/comment_2_16994dc86b87592fc62799e2d206d172._comment
new file mode 100644
index 000000000..2c5f408e7
--- /dev/null
+++ b/doc/forum/XMPP_email_setup_says_wrong_password_but_it__39__s_correct._Can_I_provide_some_kind_of_debug_data__63__/comment_2_16994dc86b87592fc62799e2d206d172._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.252.11.120"
+ subject="comment 2"
+ date="2012-11-13T17:21:35Z"
+ content="""
+@Karsten that seems likely.
+
+I've made a change so it shows the error message from the XMPP library I'm using. Which may or may not be useful..
+"""]]
diff --git a/doc/forum/get_and_copy_with_bare_repositories/comment_1_a6e4628c0770e3f5e81348a6f29dd845._comment b/doc/forum/get_and_copy_with_bare_repositories/comment_1_a6e4628c0770e3f5e81348a6f29dd845._comment
new file mode 100644
index 000000000..a19dd8631
--- /dev/null
+++ b/doc/forum/get_and_copy_with_bare_repositories/comment_1_a6e4628c0770e3f5e81348a6f29dd845._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.252.11.120"
+ subject="comment 1"
+ date="2012-11-13T17:30:31Z"
+ content="""
+git-annex commands only operate on files in the currently checked out working copy. You can send files to/from bare repos from non-bare repos. But you cannot do anything with them inside the bare repo, just as regular git doesn't let you commit inside a bare repo.
+
+There is talk about [[todo/add_-all_option]], which would be usable in bare repos.
+"""]]