merged ghc 7.4 support into master

This commit is contained in:
Joey Hess 2012-02-07 14:15:37 -04:00
parent b51d7de608
commit 2dcce5a8bb
2 changed files with 4 additions and 4 deletions

View file

@ -3,10 +3,9 @@ This bug is reopened to track some new UTF-8 filename issues caused by GHC
encoding no longer works. Even unicode filenames fail to work when encoding no longer works. Even unicode filenames fail to work when
git-annex is built with 7.4. --[[Joey]] git-annex is built with 7.4. --[[Joey]]
I now have a `ghc7.4` branch in git that seems to solve this, This bug is now fixed in current master. Once again, git-annex will work
for all filename encodings, and all system encodings. It will for all filename encodings, and all system encodings. It will
only build with the new GHC. If you have this problem, give it a try! only build with the new GHC. [[done]] --[[Joey]]
--[[Joey]]
---- ----

View file

@ -28,7 +28,8 @@ The git repository has some branches:
library. library.
* `tweak-fetch` adds support for the git tweak-fetch hook, which has * `tweak-fetch` adds support for the git tweak-fetch hook, which has
been proposed and implemented but not yet accepted into git. been proposed and implemented but not yet accepted into git.
* `ghc7.4` is for use this that version of ghc. * `ghc7.0` supports versions of ghc older than 7.4, which
had a major change to filename encoding.
* `setup` contains configuration for this website * `setup` contains configuration for this website
* `pristine-tar` contains [pristine-tar](http://kitenet.net/~joey/code/pristine-tar) * `pristine-tar` contains [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
data to create tarballs of any past git-annex release. data to create tarballs of any past git-annex release.