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

This commit is contained in:
Joey Hess 2013-09-25 15:30:45 -04:00
commit 5ff9224b10
13 changed files with 160 additions and 0 deletions

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.108.220"
subject="comment 1"
date="2013-09-25T18:27:24Z"
content="""
Sounds like the SRV lookup is failing. Does `git-annex version` list either DNS or ADNS in the build flags?
Does `host -t SRV _xmpp-client._tcp.gmail.com` work?
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.108.220"
subject="comment 1"
date="2013-09-25T18:21:25Z"
content="""
Import skips symlinks and other non-regular files. It would work if the source repository was in direct mode.
"""]]

View file

@ -0,0 +1,21 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.108.220"
subject="comment 1"
date="2013-09-25T18:57:25Z"
content="""
Worse than being stuck partway converted, it fails in such a way that the file you can't write to is left stuck in .git/annex/objects/ without a symlink pointint to it.
Here is how to recover:
1. run `git annex direct`
2. run `git annex indirect`
3. run `git annex direct`
4. run `git annex indirect`
5. run `git revert HEAD`
6. run `git annex direct`
7. fix the permission of the file
8. run `git annex indirect`
Please don't ask me why this works, but it will..
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.108.220"
subject="comment 1"
date="2013-09-25T18:18:49Z"
content="""
The tarballs are built on Debian stable in order to have an old enough libc to work most places. So I am limited to what is available in stable and backports. Once there is a backport available of git, I will use it.
"""]]

View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.108.220"
subject="comment 5"
date="2013-09-25T18:36:39Z"
content="""
That doesn't look very big, I merge one 3x that large on a 128 mb machine.
I think you will need to either email me privately so I can get a copy of your repository to investigate with ... or you can try to investigate on your own.
I think the first things I would try to debug this are to look over `git annex merge --debug` and see if I see anything unusual, and then I would probably `git checkout git-annex` in the repository, and wc -l on all the files and see if any file has a lot of lines, or is otherwise very large.
If that found nothing, my next step would be to rebuild git-annex from source with memory profiling enabled, as explained in this book, and try to get a memory profiling graph that explained what was using up the memory. <http://book.realworldhaskell.org/read/profiling-and-optimization.html>
"""]]