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

5 files changed, 57 insertions, 0 deletions

diff --git a/doc/bugs/import_memleak_from_the_assistant/comment_2_56089b7ad5d02c39ae0aacb442d789e9._comment b/doc/bugs/import_memleak_from_the_assistant/comment_2_56089b7ad5d02c39ae0aacb442d789e9._comment
new file mode 100644
index 000000000..dbc63d234
--- /dev/null
+++ b/doc/bugs/import_memleak_from_the_assistant/comment_2_56089b7ad5d02c39ae0aacb442d789e9._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="https://launchpad.net/~psycojoker"
+ nickname="psycojoker"
+ subject="comment 2"
+ date="2014-01-04T04:43:26Z"
+ content="""
+There are 139 files in this repo but this repos is updated very frequently (the files are generated every 10min).
+
+After a lot of fight with cabal and cabal-dev, I've managed to make EKG run, here is a screenshotof the result after hours of run and an actual consumption of 33.8% of 8gb of ram.
+
+http://pix.toile-libre.org/upload/original/1388810323.png
+
+But looking at it I don't know how it can be usefull. I don't know very well the haskell ecosystem, don't hesitate to point me to things that could help.
+
+On a more positive note: git annex compiled from cabal (and from source) seems to eat my available memory way slower than the one from the ubuntu ppa.
+"""]]
diff --git a/doc/forum/Gitolite_problems.mdwn b/doc/forum/Gitolite_problems.mdwn
new file mode 100644
index 000000000..903444cc8
--- /dev/null
+++ b/doc/forum/Gitolite_problems.mdwn
@@ -0,0 +1,10 @@
+I am having some issues trying to make git-annex work with the latest version of Gitolite, 
+When running git annex sync, or git annex copy --to I get.
+"""
+Failed to get annex.uuid configuration of repository origin
+
+Instead, got: "annex.uuid=\ncore.gcrypt-id=\n"
+"""
+
+Has anyone found any solution to this? Also, I am using the latest version of Gitolite, because I wanted to see whether it would work.
+Thanks, Zack.
diff --git a/doc/forum/git_annex_on_osx_only_creating_symlinks__63____63__/comment_2_978fc11c463a457382fddd668cd1d0dd._comment b/doc/forum/git_annex_on_osx_only_creating_symlinks__63____63__/comment_2_978fc11c463a457382fddd668cd1d0dd._comment
new file mode 100644
index 000000000..e50e0b073
--- /dev/null
+++ b/doc/forum/git_annex_on_osx_only_creating_symlinks__63____63__/comment_2_978fc11c463a457382fddd668cd1d0dd._comment
@@ -0,0 +1,20 @@
+[[!comment format=txt
+ username="https://www.google.com/accounts/o8/id?id=AItOawkipQLNyt8RHREHpg2k5wdYeRSCCvSNSBg"
+ nickname="Tim"
+ subject="I had this same problem too"
+ date="2014-01-04T01:00:10Z"
+ content="""
+I was using the 2013-12-13 build and now I've upgrade to the 2014-01-03 build.  git-annex has symlinked some important workspace.xml files to nowhere.  One looks like this:
+
+workspace.xml -> ../../../.git/annex/objects/M2/8W/SHA256E-s68106--90e9cc4f617c9034db1bf462d058b82c59ade0be58de1d3a3e2f8c02606631c2.xml/SHA256E-s68106--90e9cc4f617c9034db1bf462d058b82c59ade0be58de1d3a3e2f8c02606631c2.xml
+
+The referenced file doesn't exist.  Actually, that entire M2 directory doesn't exist.
+
+This has cost me a lot of time trying to fix this.  I tried git-annex fsck and I get this message:
+
+ ** No known copies exist of XXXXXXX/workspace.xml
+
+\"XXXXXXX\" is a path I needed to obscure
+
+I can see it in the git-annex repo but it is a reference to a symlink that doesn't exist.  Is there any way to get this file back?  git-annex whereis tells me it is nowhere.  This appears to be real data loss.
+"""]]
diff --git a/doc/forum/git_annex_on_osx_only_creating_symlinks__63____63__/comment_3_4420bd3afaecd7536b02fc08cee82dbe._comment b/doc/forum/git_annex_on_osx_only_creating_symlinks__63____63__/comment_3_4420bd3afaecd7536b02fc08cee82dbe._comment
new file mode 100644
index 000000000..3f4ac940e
--- /dev/null
+++ b/doc/forum/git_annex_on_osx_only_creating_symlinks__63____63__/comment_3_4420bd3afaecd7536b02fc08cee82dbe._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkipQLNyt8RHREHpg2k5wdYeRSCCvSNSBg"
+ nickname="Tim"
+ subject="Sorry for the bad formatting on that last post"
+ date="2014-01-04T17:16:51Z"
+ content="""
+I have some additional information that may be helpful.  I had git-annex syncing my Mac with a Debian system.  It appears that at some point in time the Debian system's NFS connection disconnected and then may have reconnected with sshfs.  I don't know if this happened when the syncing issue occurred or not and I can't validate that since the machine was rebooted but it is possible that that caused git-annex on the Mac to choke while syncing and create the phantom symlink.  I am experiencing NFS issues at the moment so it may have contributed to this hiccup.
+"""]]
diff --git a/doc/todo/wishlist:_pack_metadata_in_direct_mode.mdwn b/doc/todo/wishlist:_pack_metadata_in_direct_mode.mdwn
new file mode 100644
index 000000000..ddf15a144
--- /dev/null
+++ b/doc/todo/wishlist:_pack_metadata_in_direct_mode.mdwn
@@ -0,0 +1,3 @@
+The metadata storage for direct mode (V3) is this. In directory .git/annex/objects, there is one .map for all annexed file, and one .cache for all files in the working tree. Both are small files, containing only 1 line or a few lines. I have a repo with lots of photos, and this created lots of small files. I believe this will cause many performance issues. 
+
+It would be great if these files are packed, maybe also in the git pack files format.