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

7 files changed, 168 insertions, 0 deletions

diff --git a/doc/bugs/__96__git_annex_import__96___does_not_work_on_other_git_annex_repositories.mdwn b/doc/bugs/__96__git_annex_import__96___does_not_work_on_other_git_annex_repositories.mdwn
new file mode 100644
index 000000000..622c67cea
--- /dev/null
+++ b/doc/bugs/__96__git_annex_import__96___does_not_work_on_other_git_annex_repositories.mdwn
@@ -0,0 +1,98 @@
+### Please describe the problem.
+
+`git annex import otherrepo` does not work.
+
+
+### What steps will reproduce the problem?
+
+    richih@eudyptes  ~ % mcd killme/git-annex-source
+    richih@eudyptes  ~/killme/git-annex-source % git init; git annex init
+    Initialized empty Git repository in /home/richih/killme/git-annex-source/.git/
+    init  ok
+    (Recording state in git...)
+    richih@eudyptes (git)-[master] ~/killme/git-annex-source % dd if=/dev/urandom of=foo bs=1M count=1
+    1+0 records in
+    1+0 records out
+    1048576 bytes (1.0 MB) copied, 0.281043 s, 3.7 MB/s
+    richih@eudyptes (git)-[master] ~/killme/git-annex-source % git annex add .
+    add foo (checksum...) ok
+    (Recording state in git...)
+    richih@eudyptes (git)-[master] ~/killme/git-annex-source % git commit -m files
+    [master (root-commit) 8054eeb] files
+     1 file changed, 1 insertion(+)
+     create mode 120000 foo
+    richih@eudyptes (git)-[master] ~/killme/git-annex-source % mcd ../git-annex-import
+    richih@eudyptes  ~/killme/git-annex-import % git init; git annex init
+    Initialized empty Git repository in /home/richih/killme/git-annex-import/.git/
+    init  ok
+    (Recording state in git...)
+    richih@eudyptes (git)-[master] ~/killme/git-annex-import % git annex import ../git-annex-source/foo
+    richih@eudyptes (git)-[master] ~/killme/git-annex-import % ls
+
+### What version of git-annex are you using? On what operating system?
+
+4.20130920 on Debian Sid
+
+
+### PS:
+
+To add insult to injury, this does "work":
+
+    ih@eudyptes (git)-[master] ~/killme/git-annex-import % mcd bar
+    richih@eudyptes (git)-[master] ~/killme/git-annex-import/bar % git annex import ../../git-annex-source/
+    import .git/description (checksum...) ok
+    import .git/HEAD (checksum...) ok
+    import .git/config (checksum...) ok
+    import .git/index (checksum...) ok
+    import .git/COMMIT_EDITMSG (checksum...) ok
+    import .git/refs/heads/git-annex (checksum...) ok
+    import .git/refs/heads/master (checksum...) ok
+    import .git/hooks/update.sample (checksum...) ok
+    import .git/hooks/applypatch-msg.sample (checksum...) ok
+    import .git/hooks/pre-rebase.sample (checksum...) ok
+    import .git/hooks/pre-commit.sample (checksum...) ok
+    import .git/hooks/pre-applypatch.sample (checksum...) ok
+    import .git/hooks/prepare-commit-msg.sample (checksum...) ok
+    import .git/hooks/commit-msg.sample (checksum...) ok
+    import .git/hooks/post-update.sample (checksum...) ok
+    import .git/hooks/pre-push.sample (checksum...) ok
+    import .git/hooks/pre-commit (checksum...) ok
+    import .git/info/exclude (checksum...) ok
+    import .git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 (checksum...) ok
+    import .git/objects/a2/6f9bdbe47ada699d537eaa8b6fbfc1e53ef214 (checksum...) ok
+    import .git/objects/30/4b790d132863d54313e2380bed17e557944f08 (checksum...) ok
+    import .git/objects/ab/09feaa1b55080f42ccfad8c8bb5612f2397c5a (checksum...) ok
+    import .git/objects/95/b73ee41ebe8abbd5d8c0c368d1148b5256d4f2 (checksum...) ok
+    import .git/objects/2e/96f9962c1baf83c563aa59dcc67e19f21d4b1f (checksum...) ok
+    import .git/objects/74/6306e594874907246b2300b3af22f2805dde3e (checksum...) ok
+    import .git/objects/5b/11e29d0ef96be4ee73f8dae9b2f525cb808ef1 (checksum...) ok
+    import .git/objects/fc/0c0dc4d0579a15c20be29186a27feb2ee77304 (checksum...) ok
+    import .git/objects/73/c38d817e0a9f1ef4699551ae83130edd166364 (checksum...) ok
+    import .git/objects/c9/80716b5b506515410ca3ad1d88ceae13d8f6f9 (checksum...) ok
+    import .git/objects/e2/6cb10dbce11f4065c249183bb085d0afc1b55d (checksum...) ok
+    import .git/objects/80/54eeb150b094b0d8483c43ccf2ddf182c71bd3 (checksum...) ok
+    import .git/annex/sentinal (checksum...) ok
+    import .git/annex/sentinal.cache (checksum...) ok
+    import .git/annex/index (checksum...) ok
+    import .git/annex/index.lck (checksum...) ok
+    import .git/annex/journal.lck (checksum...) ok
+    import .git/annex/objects/F7/zw/SHA256E-s1048576--74f3a1a65df608d1c8ae575f83c6ee21a5aeb1a914ca73f202a881f8c3ba8f59/SHA256E-s1048576--74f3a1a65df608d1c8ae575f83c6ee21a5aeb1a914ca73f202a881f8c3ba8f59 
+    git-annex: ../../git-annex-source/.git/annex/objects/F7/zw/SHA256E-s1048576--74f3a1a65df608d1c8ae575f83c6ee21a5aeb1a914ca73f202a881f8c3ba8f59/SHA256E-s1048576--74f3a1a65df608d1c8ae575f83c6ee21a5aeb1a914ca73f202a881f8c3ba8f59: rename: permission denied (Permission denied)
+    failed
+    import .git/logs/HEAD (checksum...) ok
+    import .git/logs/refs/heads/git-annex (checksum...) ok
+    import .git/logs/refs/heads/master (checksum...) ok
+    (Recording state in git...)
+    error: Invalid path 'bar/.git/COMMIT_EDITMSG'
+    error: unable to add bar/.git/COMMIT_EDITMSG to index
+    fatal: adding files failed
+    
+    git-annex: user error (xargs ["-0","git","--git-dir=/home/richih/killme/git-annex-import/.git","--work-tree=/home/richih/killme/git-annex-import","add","--"] exited 123)
+    failed
+    git-annex: import: 2 failed
+    richih@eudyptes (git)-[master] ~/killme/git-annex-import/bar % ls -la
+    total 0
+    drwxr-xr-x 3 richih richih  17 Sep 24 01:45 .
+    drwxr-xr-x 4 richih richih  38 Sep 24 01:45 ..
+    drwxr-xr-x 8 richih richih 152 Sep 24 01:45 .git
+    richih@eudyptes (git)-[master] ~/killme/git-annex-import/bar % 
diff --git a/doc/bugs/git_version_in_prebuilt_linux_tarball_is_outdated.mdwn b/doc/bugs/git_version_in_prebuilt_linux_tarball_is_outdated.mdwn
new file mode 100644
index 000000000..8aed26bba
--- /dev/null
+++ b/doc/bugs/git_version_in_prebuilt_linux_tarball_is_outdated.mdwn
@@ -0,0 +1,8 @@
+### Please describe the problem.
+I created a .gitignore file and added it to git annex. In the assistant webapp log, the error "The installed version of git is too old for .gitignores to be honored by git-annex." shows up. According to [[bugs/assistant_ignore_.gitignore/]] this bug should be fixed in a later git version.
+
+### What steps will reproduce the problem?
+Download the current prebuilt linux tarball from [[/install]], extract it, run "./runshell", then "git --version" returns "git version 1.7.10.4"
+
+### What version of git-annex are you using? On what operating system?
+git-annex-standalone-amd64.tar.gz	2013-09-22 09:56 (Linux Ubuntu Precise)
diff --git a/doc/devblog/day_19__moving_on/comment_1_870106f671f9a055b81e6fc83e0850b5._comment b/doc/devblog/day_19__moving_on/comment_1_870106f671f9a055b81e6fc83e0850b5._comment
new file mode 100644
index 000000000..b0ed97bcf
--- /dev/null
+++ b/doc/devblog/day_19__moving_on/comment_1_870106f671f9a055b81e6fc83e0850b5._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmW0kg4uiMIhSHeVuvJFyo2VYMl7Qoej0s"
+ nickname="Chris"
+ subject="comment 1"
+ date="2013-09-23T20:58:45Z"
+ content="""
+The new version of the Android apk doesn't work for me on my Nexus 4.
+"""]]
diff --git a/doc/devblog/day_19__moving_on/comment_2_fad055c8860385ac6c012f897c96408f._comment b/doc/devblog/day_19__moving_on/comment_2_fad055c8860385ac6c012f897c96408f._comment
new file mode 100644
index 000000000..f2e754b3a
--- /dev/null
+++ b/doc/devblog/day_19__moving_on/comment_2_fad055c8860385ac6c012f897c96408f._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8"
+ nickname="develop"
+ subject="comment 2"
+ date="2013-09-24T07:11:31Z"
+ content="""
+Yeah, no joy on Cyanogenmod 10.2(Android 4.3).
+
+Would be pretty surprising if it had worked.
+"""]]
diff --git a/doc/devblog/day_19__moving_on/comment_3_69e47d612159587f080ab761566d1830._comment b/doc/devblog/day_19__moving_on/comment_3_69e47d612159587f080ab761566d1830._comment
new file mode 100644
index 000000000..206fdd852
--- /dev/null
+++ b/doc/devblog/day_19__moving_on/comment_3_69e47d612159587f080ab761566d1830._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnR6E5iUghMWdUGlbA9CCs8DKaoigMjJXw"
+ nickname="Efraim"
+ subject="not working on my nexus 4 either"
+ date="2013-09-24T07:37:28Z"
+ content="""
+terminal output reads:
+
+Falling back to hardcoded app location; cannot find expected files in /data/app-lib
+
+git annex webapp
+
+u0_a124@mako:/sdcard/git-annex.home $ git annex webpp
+
+CANNOT LINK EXECUTABLE: git-annex invalid R_ARM_COPY relocation against DT_SYMBOLIC shared library libc.so (built with -Bsymbolic?)
+
+1|u0_a124@mako:/sdcard/git-annex.home $
+"""]]
diff --git a/doc/forum/Slightly_finer_control_over_file_whereabouts/comment_9_a17c102a45e4fc3f101a79acb8eb4081._comment b/doc/forum/Slightly_finer_control_over_file_whereabouts/comment_9_a17c102a45e4fc3f101a79acb8eb4081._comment
new file mode 100644
index 000000000..56d22c7fd
--- /dev/null
+++ b/doc/forum/Slightly_finer_control_over_file_whereabouts/comment_9_a17c102a45e4fc3f101a79acb8eb4081._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ"
+ nickname="Walter"
+ subject="comment 9"
+ date="2013-09-23T21:58:42Z"
+ content="""
+Thinking about this further, I'm not entirely sure what I want. I think the confusion arises from git-annex sometimes (mostly) caring about file *contents* (ie dependent on the hash of the file), but sometimes (preferred content, not sure of anywhere else) caring about file *location*.
+
+What I think I actually want is a way of specifying locations that are not synced, such that if the file is changed somewhere (on another computer), the new version should not be downloaded. But, if the same content is in another location as well, the behaviour should be stable, I don't know how that should work though.
+
+So, perhaps the best strategy is to have an explicit list of locations that I don't want, in the preferred content expression, if it could cope with files being in and out of some location at the same time. I think this would be easiest if I could avoid manually editing the expression all the time, maybe make a file with a list of file locations, if it would be possible for git-annex to handle that? I think it isn't at the moment, and my haskell is non-existent. That way, I could write some helper to add and remove files from this list. For example `dont-want file1 file2 dir1` would add these locations to a file, and `want file1 file2 dir1` would remove them from this list. Actually, I suppose I could make it just create an appropriate preferred-content expression, and then it doesn't need to support some file of locations.
+
+So, after that ramble, I guess I'm envisaging a preferred content expression like `content=(exclude=path/to/file1 and exclude=path/to/file1 and exclude=path/to/dir1/*) or (some statement about numcopies)`, which I imagine updating whenever I decide I do/don't want some file. The only obstacle to this working is [[bugs/Handling of files inside and outside archive directory at the same time]] (as I understand that bug, could be wrong on the implications of it), meaning (of course) if there are two files with the same content, and I exclude one of them, and not the other, then it both wants and doesn't want the file, and it (and I) get really confused.
+
+I suppose a short-term (well, slow) solution is to find duplicates of files I don't want, and if that exists either add the duplicate to my content expression (to say I don't want it), or remove the one I don't want from the expression (to say I do). This doesn't work well for when the content of one of the files changes (and so they are no longer duplicates), but I think I would search for them each time I generate the expression, so at that time it would no longer find the duplicate.
+
+So, @joey, I guess my question is, what are the chances of that bug being resolved somehow? Or if that is not likely to happen soon, I might try to implement my solution outline from the previous two paragraphs.
+"""]]
diff --git a/doc/install/Android/comment_10_225f2c6fe255be93702cfbd4dc172f3b._comment b/doc/install/Android/comment_10_225f2c6fe255be93702cfbd4dc172f3b._comment
new file mode 100644
index 000000000..f6a71981e
--- /dev/null
+++ b/doc/install/Android/comment_10_225f2c6fe255be93702cfbd4dc172f3b._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://id.clacke.se/"
+ nickname="clacke"
+ subject="+1 F-Droid"
+ date="2013-09-24T18:36:48Z"
+ content="""
+Availability in F-Droid would be really neat. I imagine the unusual build requirements would require some work though.
+"""]]