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

This commit is contained in:
Joey Hess 2012-04-12 12:32:37 -04:00
commit 262b773b8f
3 changed files with 45 additions and 0 deletions

View file

@ -0,0 +1,26 @@
First, I'm using a 2011 version because i'm getting this kind of errors from cabal install (on Fedora 16 and 17):
$ cabal install git-annex --bindir=$HOME/.local/bin
Resolving dependencies...
cabal: cannot configure git-annex-3.20120406. It requires base >=4.5 && <5
For the dependency on base >=4.5 && <5 there are these packages: base-4.5.0.0.
However none of them are available.
base-4.5.0.0 was excluded because of the top level dependency base -any
So I installed a 2011 version and it worked.
Now, when I add some files in the git annex repository I get an error:
$ git annex add Photo\ Library/2010/06/28/IMG_4926.JPG
add Photo Library/2010/06/28/IMG_4926.JPG (checksum...)
git-annex: Photo Library/2010/06/28/IMG_4926.JPG: getFileStatus: does not exist (No such file or directory)
failed
git-annex: add: 1 failed
None of the other files in the same directory are a problem. The file content is not a problem either as I can move the file elsewhere and git annex add it w/o any problem. It's this file in this directory that causes the problem.
Something interesting though. If I move the file elsewhere, and git annex add it, there is no problem. Now, if I git mv the file back into its original location, and git annex fix the file, the symbolic link is wrong: instead of pointing to `../../../../.git/annex/objects/somefile` it points to `../../../annex/objects/somefile` (notice the missing `../.git/` part of the path).
I can fix that by hand, and it works well, but that's very annoying. There are not much files having that bug though.
[Mildred](http://mildred.fr)

View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="http://mildred.pip.verisignlabs.com/"
subject="Manually fixing links doesn't even work"
date="2012-04-12T15:46:54Z"
content="""
I'm just answering myself: manually fixing symlinks doesn't always works. Sometimes the pre-commit hook will just rewrite the link to some wrong path.
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joey.kitenet.net/"
nickname="joey"
subject="comment 2"
date="2012-04-12T16:29:58Z"
content="""
This bug was fixed in git-annex 3.20120230. You have a few options to get the fix:
* Upgrade to ghc 4.7, the need for which is the cause of the cabal error message you pasted.
* Manually [[download]] from git, and `git checkout ghc7.0` -- that branch will build with your old ghc and has the fix.
* cherry-pick commit 51338486dcf9ab86de426e41b1eb31af1d3a6c87
"""]]