diff options
Diffstat (limited to 'doc/bugs/build_issue_with_8baff14054e65ecbe801eb66786a55fa5245cb30.mdwn')
-rw-r--r-- | doc/bugs/build_issue_with_8baff14054e65ecbe801eb66786a55fa5245cb30.mdwn | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/doc/bugs/build_issue_with_8baff14054e65ecbe801eb66786a55fa5245cb30.mdwn b/doc/bugs/build_issue_with_8baff14054e65ecbe801eb66786a55fa5245cb30.mdwn new file mode 100644 index 000000000..34c2eef5f --- /dev/null +++ b/doc/bugs/build_issue_with_8baff14054e65ecbe801eb66786a55fa5245cb30.mdwn @@ -0,0 +1,43 @@ +Building commit 8baff14054e65ecbe801eb66786a55fa5245cb30 yields this... + + +<pre> +[164 of 189] Compiling Command.Sync ( Command/Sync.hs, tmp/Command/Sync.o ) +Command/Sync.hs:268:34: +Not in scope: `vermarker' +Perhaps you meant `varmarker' (line 267) +make: *** [git-annex] Error 1 +</pre> + +Supplied fix... + +<pre> + +From a23a1af99c7a95c316a87f9c6f5f67a6f8ff6937 Mon Sep 17 00:00:00 2001 +From: Jimmy Tang <jtang@tchpc.tcd.ie> +Date: Wed, 27 Jun 2012 21:55:22 +0100 +Subject: [PATCH 14/14] fix build issue introduced in + 8baff14054e65ecbe801eb66786a55fa5245cb30 + +--- + Command/Sync.hs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Command/Sync.hs b/Command/Sync.hs +index b2bf24d..dfaed59 100644 +--- a/Command/Sync.hs ++++ b/Command/Sync.hs +@@ -265,7 +265,7 @@ mergeFile file key + | otherwise = go $ shortHash $ show key + where + varmarker = ".variant-" +- doubleconflict = vermarker `isSuffixOf` (dropExtension file) ++ doubleconflict = varmarker `isSuffixOf` (dropExtension file) + go v = takeDirectory file + </> dropExtension (takeFileName file) + ++ varmarker ++ v +-- +1.7.11.1 +</pre> + +[[fixed|done]] |