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

5 files changed, 70 insertions, 0 deletions

diff --git a/doc/bugs/Error_when_dropping___34__hGetLine:_end_of_file__34__/comment_10_8742f7ac27b5f4ad6261d04a174a691c._comment b/doc/bugs/Error_when_dropping___34__hGetLine:_end_of_file__34__/comment_10_8742f7ac27b5f4ad6261d04a174a691c._comment
new file mode 100644
index 000000000..921a20024
--- /dev/null
+++ b/doc/bugs/Error_when_dropping___34__hGetLine:_end_of_file__34__/comment_10_8742f7ac27b5f4ad6261d04a174a691c._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.153.14.162"
+ subject="comment 10"
+ date="2012-12-06T22:00:45Z"
+ content="""
+Can you show me a transcript of git-check-attr? This is sounding like a git bug.
+
+(The build error is due to too old a version of yesod.)
+"""]]
diff --git a/doc/bugs/Error_when_dropping___34__hGetLine:_end_of_file__34__/comment_11_b8e720340000537de6713c49b7733b2f._comment b/doc/bugs/Error_when_dropping___34__hGetLine:_end_of_file__34__/comment_11_b8e720340000537de6713c49b7733b2f._comment
new file mode 100644
index 000000000..db964e58c
--- /dev/null
+++ b/doc/bugs/Error_when_dropping___34__hGetLine:_end_of_file__34__/comment_11_b8e720340000537de6713c49b7733b2f._comment
@@ -0,0 +1,21 @@
+[[!comment format=mdwn
+ username="spwhitton"
+ ip="163.1.167.50"
+ subject="comment 11"
+ date="2012-12-06T22:17:37Z"
+ content="""
+Upgrading yesod then git-annex removes the problem I was seeing.  Thanks for your help with that.  Here is a `git-check-attr` session:
+
+    backups $ git check-attr --stdin annex.backend annex.numcopies --
+    athena-etc.tar.gz
+    athena-etc.tar.gz: annex.backend: unspecified
+    athena-etc.tar.gz: annex.numcopies: 2
+    athena-mail.gz
+    athena-mail.gz: annex.backend: unspecified
+    athena-mail.gz: annex.numcopies: 2
+    athena-web.tar.gz
+    athena-web.tar.gz: annex.backend: unspecified
+    athena-web.tar.gz: annex.numcopies: 2
+    [^D pressed]
+    backups $ 
+"""]]
diff --git a/doc/bugs/Error_when_dropping___34__hGetLine:_end_of_file__34__/comment_9_6d4c9f0e133ebd94fc11346df446402e._comment b/doc/bugs/Error_when_dropping___34__hGetLine:_end_of_file__34__/comment_9_6d4c9f0e133ebd94fc11346df446402e._comment
new file mode 100644
index 000000000..a48e98ebc
--- /dev/null
+++ b/doc/bugs/Error_when_dropping___34__hGetLine:_end_of_file__34__/comment_9_6d4c9f0e133ebd94fc11346df446402e._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="spwhitton"
+ ip="163.1.167.50"
+ subject="comment 9"
+ date="2012-12-06T21:37:52Z"
+ content="""
+Yes, running git-attr like that does indeed produce the problem.  I attempted to rebuild git-annex using cabal, but the build failed with the following error:
+
+    [273 of 290] Compiling Assistant.WebApp.Configurators.Local ( Assistant/WebApp/Configurators/Local.hs, dist/build/git-annex/git-annex-tmp/Assistant/WebApp/Configurators/Local.o )
+    
+    Assistant/WebApp/Configurators/Local.hs:55:11:
+        `fieldEnctype' is not a (visible) field of constructor `Field'
+    cabal: Error: some packages failed to install:
+    git-annex-3.20121127.1 failed during the building phase. The exception was:
+    ExitFailure 1
+"""]]
diff --git a/doc/forum/Can__39__t_install:_Mac_OS_10.8.2/comment_3_b37b2a9906ffb956cca91adb4bb4e521._comment b/doc/forum/Can__39__t_install:_Mac_OS_10.8.2/comment_3_b37b2a9906ffb956cca91adb4bb4e521._comment
new file mode 100644
index 000000000..dbfff2a84
--- /dev/null
+++ b/doc/forum/Can__39__t_install:_Mac_OS_10.8.2/comment_3_b37b2a9906ffb956cca91adb4bb4e521._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.153.14.162"
+ subject="comment 3"
+ date="2012-12-06T21:20:19Z"
+ content="""
+I can't help with installing libraries on OSX, but you can disable XMPP support in git-annex like this: \"cabal install git-annex -f-XMPP\"
+"""]]
diff --git a/doc/forum/Can__39__t_install:_Mac_OS_10.8.2/comment_4_afddf16f8faedc78d458835480f10dc3._comment b/doc/forum/Can__39__t_install:_Mac_OS_10.8.2/comment_4_afddf16f8faedc78d458835480f10dc3._comment
new file mode 100644
index 000000000..c221455fc
--- /dev/null
+++ b/doc/forum/Can__39__t_install:_Mac_OS_10.8.2/comment_4_afddf16f8faedc78d458835480f10dc3._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlxKQEwwP6J58W0Dmfq0-v0j3LXtT5gNAA"
+ nickname="Carlito"
+ subject="Got it to work!"
+ date="2012-12-06T22:17:55Z"
+ content="""
+Had to link it: 
+
+    brew install libxml2 
+    brew link libxml2
+
+Thanks for your help.
+
+Will test out annex and leave any bug reports.
+"""]]