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

3 files changed, 72 insertions, 0 deletions

diff --git a/doc/bugs/4.20130227_won__39__t_build_on_OS_X_Lion__44___because_testpack_won__39__t_build.mdwn b/doc/bugs/4.20130227_won__39__t_build_on_OS_X_Lion__44___because_testpack_won__39__t_build.mdwn
new file mode 100644
index 000000000..1a1a011b4
--- /dev/null
+++ b/doc/bugs/4.20130227_won__39__t_build_on_OS_X_Lion__44___because_testpack_won__39__t_build.mdwn
@@ -0,0 +1,56 @@
+What steps will reproduce the problem?
+
+install from a git checkout of tag 4.20130227; error comes up at the "cabal install" stage.
+
+
+What is the expected output? What do you see instead?
+
+Expected successful install; got:
+
+
+    git-annex.branchable.com$ cabal install --bindir=$HOME/bin
+    Resolving dependencies...
+    Configuring testpack-2.1.2...
+    Building testpack-2.1.2...
+    Preprocessing library testpack-2.1.2...
+    [1 of 3] Compiling Test.QuickCheck.Instances ( src/Test/QuickCheck/Instances.hs, dist/build/Test/QuickCheck/Instances.o )
+    [2 of 3] Compiling Test.QuickCheck.Tools ( src/Test/QuickCheck/Tools.hs, dist/build/Test/QuickCheck/Tools.o )
+    
+    src/Test/QuickCheck/Tools.hs:33:9:
+        Warning: Fields of `MkResult' not initialised: abort
+        In the expression:
+          MkResult
+            {ok = Just (expected == actual), expect = True,
+             interrupted = False,
+             reason = "Result: expected "
+                      ++ show expected ++ ", got " ++ show actual,
+             stamp = [], callbacks = []}
+        In an equation for `@=?':
+            expected @=? actual
+              = MkResult
+                  {ok = Just (expected == actual), expect = True,
+                   interrupted = False,
+                   reason = "Result: expected "
+                            ++ show expected ++ ", got " ++ show actual,
+                   stamp = [], callbacks = []}
+    [3 of 3] Compiling Test.HUnit.Tools ( src/Test/HUnit/Tools.hs, dist/build/Test/HUnit/Tools.o )
+    
+    src/Test/HUnit/Tools.hs:131:57:
+        `maxDiscard' is not a (visible) constructor field name
+    
+    src/Test/HUnit/Tools.hs:177:40: Not in scope: `maxDiscard'
+    Failed to install testpack-2.1.2
+    cabal: Error: some packages failed to install:
+    git-annex-4.20130227 depends on testpack-2.1.2 which failed to install.
+    testpack-2.1.2 failed during the building phase. The exception was:
+    ExitFailure 1
+    git-annex.branchable.com$ 
+
+
+What version of git-annex are you using? On what operating system?
+
+trying to compile git checkout of 4.20130227 on OS X Lion.
+
+Please provide any additional information below.
+
+
diff --git a/doc/bugs/4.20130227_won__39__t_build_on_OS_X_Lion__44___because_testpack_won__39__t_build/comment_1_b7140e2bf1ea9c73ecc9e214095968e7._comment b/doc/bugs/4.20130227_won__39__t_build_on_OS_X_Lion__44___because_testpack_won__39__t_build/comment_1_b7140e2bf1ea9c73ecc9e214095968e7._comment
new file mode 100644
index 000000000..b4e0c69f7
--- /dev/null
+++ b/doc/bugs/4.20130227_won__39__t_build_on_OS_X_Lion__44___because_testpack_won__39__t_build/comment_1_b7140e2bf1ea9c73ecc9e214095968e7._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 1"
+ date="2013-02-28T02:12:50Z"
+ content="""
+Pass -f-TestSuite to cabal to disable building the test suite.
+"""]]
diff --git a/doc/design/assistant/blog/day_200__release_day/comment_1_a68e1ed7829b49086c567d97ddc09912._comment b/doc/design/assistant/blog/day_200__release_day/comment_1_a68e1ed7829b49086c567d97ddc09912._comment
new file mode 100644
index 000000000..51247f6b7
--- /dev/null
+++ b/doc/design/assistant/blog/day_200__release_day/comment_1_a68e1ed7829b49086c567d97ddc09912._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI"
+ nickname="Amitai"
+ subject="comment 1"
+ date="2013-02-28T02:53:53Z"
+ content="""
+That _is_ a neat trick, especially since you're deploying to odd platforms where you'll probably be even gladder of the in-app tests far in the future than you are now!
+"""]]