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

5 files changed, 91 insertions, 0 deletions

diff --git a/doc/bugs/Could_not_find_module_Data.Default.mdwn b/doc/bugs/Could_not_find_module_Data.Default.mdwn
new file mode 100644
index 000000000..ec53d7ce5
--- /dev/null
+++ b/doc/bugs/Could_not_find_module_Data.Default.mdwn
@@ -0,0 +1,31 @@
+**What steps will reproduce the problem?**
+
+Manually building git-annex from git.
+
+**What is the expected output? What do you see instead?**
+
+    $ cabal update
+    ...
+    $ cabal install --only-dependencies
+    ...
+    $ cabal configure
+    ...
+    $ cabal build
+    Building git-annex-3.20120826...
+    Preprocessing executable 'git-annex' for git-annex-3.20120826...
+    
+    Utility/Yesod.hs:15:8:
+        Could not find module `Data.Default'
+        It is a member of the hidden package `data-default-0.5.0'.
+        Perhaps you need to add `data-default' to the build-depends in your .cabal file.
+        Use -v to see a list of the files searched for.
+    $
+
+**What version of git-annex are you using? On what operating system?**
+
+commit e7d728672a5fc923be9ab1d6fe4b65f2058b49c7
+Arch Linux
+
+**Please provide any additional information below.**
+
+When I add data-default to git-annex.cabal's Build-Deps it works fine.
diff --git a/doc/design/assistant/blog/day_66__the_merge/comment_5_8ce638960012367c888e018a5f05db19._comment b/doc/design/assistant/blog/day_66__the_merge/comment_5_8ce638960012367c888e018a5f05db19._comment
new file mode 100644
index 000000000..f51f5ef52
--- /dev/null
+++ b/doc/design/assistant/blog/day_66__the_merge/comment_5_8ce638960012367c888e018a5f05db19._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.152.246.16"
+ subject="comment 5"
+ date="2012-08-29T22:17:01Z"
+ content="""
+@kevwalke: I fixed that problem today.
+"""]]
diff --git a/doc/design/assistant/blog/day_66__the_merge/comment_6_f461b856b940e6914bcd2b681cf9505f._comment b/doc/design/assistant/blog/day_66__the_merge/comment_6_f461b856b940e6914bcd2b681cf9505f._comment
new file mode 100644
index 000000000..2232c426b
--- /dev/null
+++ b/doc/design/assistant/blog/day_66__the_merge/comment_6_f461b856b940e6914bcd2b681cf9505f._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="http://kevwalke.myopenid.com/"
+ ip="77.86.30.139"
+ subject="getting new error now."
+ date="2012-08-30T11:55:49Z"
+ content="""
+Seems there is still an issue here on fresh install...
+
+cabal: Error: some packages failed to install:
+dbus-0.10 depends on libxml-sax-0.7.2 which failed to install.
+libxml-sax-0.7.2 failed during the configure step. The exception was:
+ExitFailure 
+"""]]
diff --git a/doc/forum/Cabal:_Could_not_resolve_dependencies___40__yesod__41__/comment_2_44cd6f6dd674df105d6f0b3f320f3236._comment b/doc/forum/Cabal:_Could_not_resolve_dependencies___40__yesod__41__/comment_2_44cd6f6dd674df105d6f0b3f320f3236._comment
new file mode 100644
index 000000000..4d8b0a8aa
--- /dev/null
+++ b/doc/forum/Cabal:_Could_not_resolve_dependencies___40__yesod__41__/comment_2_44cd6f6dd674df105d6f0b3f320f3236._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo"
+ nickname="Tobias"
+ subject="comment 2"
+ date="2012-08-30T10:01:24Z"
+ content="""
+thanks, that resolved the dependency trouble.
+But now:
+
+    Building git-annex-3.20120826...
+    Preprocessing executable 'git-annex' for git-annex-3.20120826...
+
+    Utility/Yesod.hs:15:8:
+        Could not find module `Data.Default'
+        It is a member of the hidden package `data-default-0.5.0'.
+        Perhaps you need to add `data-default' to the build-depends in your .cabal file.
+        Use -v to see a list of the files searched for.
+
+"""]]
diff --git a/doc/forum/Problem_compiling_current_master/comment_2_fb3e27b6014e84bd919a7a4a95e39ef9._comment b/doc/forum/Problem_compiling_current_master/comment_2_fb3e27b6014e84bd919a7a4a95e39ef9._comment
new file mode 100644
index 000000000..61c6f3be6
--- /dev/null
+++ b/doc/forum/Problem_compiling_current_master/comment_2_fb3e27b6014e84bd919a7a4a95e39ef9._comment
@@ -0,0 +1,20 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmU_2tE75oyG0h2ZPN4lcroIKEMC8G-otE"
+ nickname="Michael"
+ subject="comment 2"
+ date="2012-08-30T11:32:24Z"
+ content="""
+That helped now the compile stops at:
+
+    Utility/WebApp.hs:106:9:
+        Ambiguous occurrence `liftIO'
+        It could refer to either `Yesod.liftIO',
+                                 imported from `Yesod' at Utility/WebApp.hs:14:1-12
+                                 (and originally defined in `transformers-0.2.2.0:Control.Monad.IO.Class')
+                              or `Control.Monad.IO.Class.liftIO',
+                                 imported from `Control.Monad.IO.Class' at Utility/WebApp.hs:18:1-29
+    make: *** [git-annex] Fehler 1
+
+
+
+"""]]