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

9 files changed, 134 insertions, 0 deletions

diff --git a/doc/bugs/Unable_to_take_transfer_lock.mdwn b/doc/bugs/Unable_to_take_transfer_lock.mdwn
index 9b1e0ca9b..6a95d6076 100644
--- a/doc/bugs/Unable_to_take_transfer_lock.mdwn
+++ b/doc/bugs/Unable_to_take_transfer_lock.mdwn
@@ -2,6 +2,8 @@
 
 `git annex get --from=myremote' show "transfer already in progress, or unable to take transfer lock".
 
+**Likely Problem discovered!** I copied the whole remote repo (was residing on a Linux machine accessed via SMB) and pasted it into my Mac. The problem was resolved. It is likely something to do with the fact that Mac OS filesystem is **case-insensitive**. I discovered this issue when I tried to copy that remote repo with ``cp`` rather than ``tar``ing it first.
+
 
 ### What steps will reproduce the problem?
 
diff --git a/doc/bugs/autostart__47__git-annex.desktop_gets_resurrected.mdwn b/doc/bugs/autostart__47__git-annex.desktop_gets_resurrected.mdwn
new file mode 100644
index 000000000..6d0c2a87d
--- /dev/null
+++ b/doc/bugs/autostart__47__git-annex.desktop_gets_resurrected.mdwn
@@ -0,0 +1,9 @@
+### Please describe the problem.
+
+Due to the very unstable kernel on my laptop atm I need to reboot quite frequently... and this issue with annex assistant immediately starting synchronizing (although I did disable all synchronizations in webapp, so it would be another issue I guess), I wanted just to disable autostart of git-annex altogether.  I have removed $HOME/.config/autostart/git-annex.desktop but to my surprise upon gnome crashing/relogin I had the same ssh key passphrase dialog and that file reappeared.
+
+### What version of git-annex are you using? On what operating system?
+
+5.20151116+gitg5416a1a-1~ndall+1
+
+[[!meta author=yoh]]
diff --git a/doc/bugs/git-annex-unlock_shows_files___34__here__34____44___git-annex-whereis_doesn__39__t.mdwn b/doc/bugs/git-annex-unlock_shows_files___34__here__34____44___git-annex-whereis_doesn__39__t.mdwn
new file mode 100644
index 000000000..7381cf7f3
--- /dev/null
+++ b/doc/bugs/git-annex-unlock_shows_files___34__here__34____44___git-annex-whereis_doesn__39__t.mdwn
@@ -0,0 +1,35 @@
+### Please describe the problem.
+
+``git annex unlock myfolder`` will unlock all files inside (`find myfolder -type l' returns nothing).
+
+Yet, ``git annex whereis myfolder`` shows those files are *not* in current repo.
+
+Meanwhile, those files also reside in a remote. git-annex-whereis does show there is a copy in that remote.
+
+Note that dropping files in current repo (``git annex drop``) and re-getting (``git annex get``) does download the files from that remote. However, a subsequent ``git annext whereis`` again shows 1 copy --- at that remote only.
+
+
+### What steps will reproduce the problem?
+
+Same as described above.
+
+
+### What version of git-annex are you using? On what operating system?
+
+Lubuntu 15.10
+git annex 5.20151019
+
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+
+# End of transcript or log.
+"""]]
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
+Yes, git annex is wonderful.
diff --git a/doc/bugs/remote_repo_marked_as___34__here__34__.mdwn b/doc/bugs/remote_repo_marked_as___34__here__34__.mdwn
new file mode 100644
index 000000000..44e69038d
--- /dev/null
+++ b/doc/bugs/remote_repo_marked_as___34__here__34__.mdwn
@@ -0,0 +1,34 @@
+### Please describe the problem.
+
+``git annex info`` shows a local repo as "not here" (withou the ``[here]`` tag), and shows a remote repo with the ``[here]`` tag.
+
+I had to manually edit `.git/config` to set my local repo's UUID to the correct one.
+
+
+### What steps will reproduce the problem?
+
+I just ``git annex dead`` an old repo, and ``git annex semitrust`` a new repo by the same name as the old repo.
+
+
+### What version of git-annex are you using? On what operating system?
+
+5.20150731-1build1
+
+Lubuntu 15.10
+
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+
+# End of transcript or log.
+"""]]
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
+Yes, lots of luck (need more skill).
+
+git-annex may need more error catches to prevent a wrong order of commands from corrupting a repo. But still, git annex works great.
diff --git a/doc/bugs/whereis_claims_file_is_not_here__44___but_it_is_available_both_here_and_in_another_remote/comment_3_d96ded3c27c705789e5689f19dbcabcb._comment b/doc/bugs/whereis_claims_file_is_not_here__44___but_it_is_available_both_here_and_in_another_remote/comment_3_d96ded3c27c705789e5689f19dbcabcb._comment
new file mode 100644
index 000000000..3f38426f6
--- /dev/null
+++ b/doc/bugs/whereis_claims_file_is_not_here__44___but_it_is_available_both_here_and_in_another_remote/comment_3_d96ded3c27c705789e5689f19dbcabcb._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="jhannwong@c9c7a67b5632a4bbc0c959cfeb3d340e02f28565"
+ nickname="jhannwong"
+ subject="git annex fsck didn't solve this problem"
+ date="2015-11-20T01:49:03Z"
+ content="""
+Same problem here.
+"""]]
diff --git a/doc/forum/git_annex_drop_not_freeing_space_on_filesystem/comment_3_de4aa12c84a6025497f8c743a397ef63._comment b/doc/forum/git_annex_drop_not_freeing_space_on_filesystem/comment_3_de4aa12c84a6025497f8c743a397ef63._comment
new file mode 100644
index 000000000..554ef36bd
--- /dev/null
+++ b/doc/forum/git_annex_drop_not_freeing_space_on_filesystem/comment_3_de4aa12c84a6025497f8c743a397ef63._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="jhannwong@c9c7a67b5632a4bbc0c959cfeb3d340e02f28565"
+ nickname="jhannwong"
+ subject="Nope, git-annex drop is still not reducing size of .git/annex"
+ date="2015-11-20T13:32:11Z"
+ content="""
+A remote has 200MB of file contents in .git/annex.
+
+A local repo issues a ``git annex drop --from=myremote``.
+
+The remote .git/annex still has 200MB of file contents.
+
+Sometimes it works. I'm guessing it has to do with the order of commands issued.
+"""]]
diff --git a/doc/news/version_5.20151116/comment_1_72d65412edd7af7df1e6e6817b7572c5._comment b/doc/news/version_5.20151116/comment_1_72d65412edd7af7df1e6e6817b7572c5._comment
new file mode 100644
index 000000000..286be07ff
--- /dev/null
+++ b/doc/news/version_5.20151116/comment_1_72d65412edd7af7df1e6e6817b7572c5._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="jtgeibel@4ad445b2ef940dedb1b6d9b19e3888e56b33541b"
+ nickname="jtgeibel"
+ subject="Git tag"
+ date="2015-11-21T00:38:13Z"
+ content="""
+Joey, I couldn't find a tag for this in the repo.  It appears to be 76139a93.
+"""]]
diff --git a/doc/stickers/comment_1_96f9b35048793c1cc0902cced82b65c5._comment b/doc/stickers/comment_1_96f9b35048793c1cc0902cced82b65c5._comment
new file mode 100644
index 000000000..8cdd7c716
--- /dev/null
+++ b/doc/stickers/comment_1_96f9b35048793c1cc0902cced82b65c5._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="http://bret.io/"
+ subject="Woo!  "
+ date="2015-11-19T23:48:01Z"
+ content="""
+Rad! Cant wait to add it to:
+
+<img src=\"https://camo.githubusercontent.com/0133cd5cab79bd8e9945d0e89337e2041d157076/68747470733a2f2f63312e737461746963666c69636b722e636f6d2f312f3732302f32313339393337353133395f303564383938316231395f622e6a7067\" height=\"400\">
+
+I like the idea of adapters too :)
+
+https://www.stickermule.com/ and https://hexi.pics/help_en both print high quality spec compliant stickers.
+"""]]
diff --git a/doc/stickers/comment_2_39cfee29eae5e69d88d84b2c65eb83fe._comment b/doc/stickers/comment_2_39cfee29eae5e69d88d84b2c65eb83fe._comment
new file mode 100644
index 000000000..63bc28509
--- /dev/null
+++ b/doc/stickers/comment_2_39cfee29eae5e69d88d84b2c65eb83fe._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="CandyAngel"
+ subject="comment 2"
+ date="2015-11-20T08:37:39Z"
+ content="""
+I don't usually like any decals on my stuff.. but I've never come across this before and it looks interesting. I'm really tempted..
+
+However, I wouldn't be able to do it without having some nice way of dealing with tolerance stacking. The overlapping stickers (bottom-right) on the photo above would drive me mad! :)
+
+I went ahead and [raised an issue](https://github.com/terinjokes/StickerConstructorSpec/issues/18) in case they want to deal with this in the specification by having a(some?) guide specification(s) too.
+"""]]