blob: ad28f9cce23650ae67f818a56b9bad96a26d41b2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnzFs0ZJvkUvEVI_OAp0aAP1CTOw2UUXl4"
nickname="Christian"
subject="A patch to fix the problem"
date="2014-01-29T17:26:58Z"
content="""
The following patch lets me compile everything, but I am not sure it is right:
[[!format sh \"\"\"
diff --git a/Command/PreCommit.hs b/Command/PreCommit.hs
index 6644f6f..f3ad454 100644
--- a/Command/PreCommit.hs
+++ b/Command/PreCommit.hs
@@ -7,7 +7,7 @@
module Command.PreCommit where
-import Common.Annex
+import Common.Annex hiding (callCommand)
import Command
import Config
import qualified Command.Add
diff --git a/Command/Sync.hs b/Command/Sync.hs
index 6ef111b..fde4a9a 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -8,7 +8,7 @@
module Command.Sync where
-import Common.Annex
+import Common.Annex hiding (callCommand)
import Command
import qualified Annex
import qualified Annex.Branch
diff --git a/RunCommand.hs b/RunCommand.hs
index 937686d..d76b457 100644
--- a/RunCommand.hs
+++ b/RunCommand.hs
@@ -9,7 +9,7 @@
module RunCommand where
-import Common.Annex
+import Common.Annex hiding (callCommand)
import qualified Annex
import Types.Command
import qualified Annex.Queue
\"\"\"]]
"""]]
|
