diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus <Jimmy@web> | 2012-06-27 20:56:33 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2012-06-27 20:56:33 +0000 |
| commit | c6d595674bb1133c81d1c29a4ad637a7c162b3da (patch) | |
| tree | 042762324d977f549a618444b5c1fa4f73aa81f8 | |
| parent | 4e4c2498b801bb25a696d116388159747ea45b8f (diff) | |
| -rw-r--r-- | doc/bugs/build_issue_with_8baff14054e65ecbe801eb66786a55fa5245cb30.mdwn | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/doc/bugs/build_issue_with_8baff14054e65ecbe801eb66786a55fa5245cb30.mdwn b/doc/bugs/build_issue_with_8baff14054e65ecbe801eb66786a55fa5245cb30.mdwn index 3242b1077..015226f7d 100644 --- a/doc/bugs/build_issue_with_8baff14054e65ecbe801eb66786a55fa5245cb30.mdwn +++ b/doc/bugs/build_issue_with_8baff14054e65ecbe801eb66786a55fa5245cb30.mdwn @@ -9,3 +9,33 @@ 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> |