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

14 files changed, 218 insertions, 0 deletions

diff --git a/doc/bugs/Android:_no___34____47__etc__47__resolv.conf__34___when_submitting_jabber_user_and_password./comment_2_9ef5c13a7a28e9098a837d42e5c4c964._comment b/doc/bugs/Android:_no___34____47__etc__47__resolv.conf__34___when_submitting_jabber_user_and_password./comment_2_9ef5c13a7a28e9098a837d42e5c4c964._comment
new file mode 100644
index 000000000..080d929b5
--- /dev/null
+++ b/doc/bugs/Android:_no___34____47__etc__47__resolv.conf__34___when_submitting_jabber_user_and_password./comment_2_9ef5c13a7a28e9098a837d42e5c4c964._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 2"
+ date="2014-05-16T17:24:00Z"
+ content="""
+This bug report is about *Android*, not OSX. Please file a new bug report about any similar problem you might have with OSX.
+
+(AFAICS, OSX systems do have a /etc/resolv.conf, so perhaps your system is broken?)
+"""]]
diff --git a/doc/bugs/Android:_no___34____47__etc__47__resolv.conf__34___when_submitting_jabber_user_and_password./comment_3_0c8087dfbcd8811913e7b3b6376cab90._comment b/doc/bugs/Android:_no___34____47__etc__47__resolv.conf__34___when_submitting_jabber_user_and_password./comment_3_0c8087dfbcd8811913e7b3b6376cab90._comment
new file mode 100644
index 000000000..2060021c0
--- /dev/null
+++ b/doc/bugs/Android:_no___34____47__etc__47__resolv.conf__34___when_submitting_jabber_user_and_password./comment_3_0c8087dfbcd8811913e7b3b6376cab90._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
+ nickname="Ovidiu"
+ subject="comment 3"
+ date="2014-05-16T17:26:59Z"
+ content="""
+ah, no I spotted the ADNROID in the title, sorry.
+I will open a new bug report then, I do have a resolv.conf:
+
+ls -al /etc/resolv.conf
+lrwxr-xr-x  1 root  wheel  22 Nov  2  2013 /etc/resolv.conf -> ../var/run/resolv.conf
+"""]]
diff --git a/doc/bugs/Android:_no___34____47__etc__47__resolv.conf__34___when_submitting_jabber_user_and_password./comment_4_8ad9047dd136e3b438fb9a6d50ecb04c._comment b/doc/bugs/Android:_no___34____47__etc__47__resolv.conf__34___when_submitting_jabber_user_and_password./comment_4_8ad9047dd136e3b438fb9a6d50ecb04c._comment
new file mode 100644
index 000000000..dd796c397
--- /dev/null
+++ b/doc/bugs/Android:_no___34____47__etc__47__resolv.conf__34___when_submitting_jabber_user_and_password./comment_4_8ad9047dd136e3b438fb9a6d50ecb04c._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 4"
+ date="2014-05-16T17:30:21Z"
+ content="""
+You have a symlink to a file that may or may not exist. I'd check if the file exists, and if your user can read it before fileing a bug report.
+"""]]
diff --git a/doc/bugs/Android:_no___34____47__etc__47__resolv.conf__34___when_submitting_jabber_user_and_password./comment_5_5f478c24065fc9a50a1cff3148b83bec._comment b/doc/bugs/Android:_no___34____47__etc__47__resolv.conf__34___when_submitting_jabber_user_and_password./comment_5_5f478c24065fc9a50a1cff3148b83bec._comment
new file mode 100644
index 000000000..65daf46ff
--- /dev/null
+++ b/doc/bugs/Android:_no___34____47__etc__47__resolv.conf__34___when_submitting_jabber_user_and_password./comment_5_5f478c24065fc9a50a1cff3148b83bec._comment
@@ -0,0 +1,20 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
+ nickname="Ovidiu"
+ subject="comment 5"
+ date="2014-05-16T17:37:29Z"
+ content="""
+I can read it just fine:
+
+cat /etc/resolv.conf
+#
+# Mac OS X Notice
+#
+# This file is not used by the host name and address resolution
+# or the DNS query routing mechanisms used by most processes on
+# this Mac OS X system.
+#
+# This file is automatically generated.
+#
+nameserver 172.20.10.1
+"""]]
diff --git a/doc/bugs/MAC_OSX_git-annex:___47__etc__47__resolv.conf:_openFile:_does_not_exist___40__No_such_file_or_directory__41__.mdwn b/doc/bugs/MAC_OSX_git-annex:___47__etc__47__resolv.conf:_openFile:_does_not_exist___40__No_such_file_or_directory__41__.mdwn
new file mode 100644
index 000000000..09fce2c6b
--- /dev/null
+++ b/doc/bugs/MAC_OSX_git-annex:___47__etc__47__resolv.conf:_openFile:_does_not_exist___40__No_such_file_or_directory__41__.mdwn
@@ -0,0 +1,35 @@
+### Please describe the problem.
+[2014-05-13 00:01:18 SAST] Cronner: Consistency check in progress
+[2014-05-13 00:29:49 SAST] NetWatcherFallback: Syncing with box.com, gitannexbackup 
+[2014-05-13 08:42:48 SAST] main: starting assistant version 5.20140420-ga25b8bb
+Already up-to-date.
+
+(scanning...) [2014-05-13 08:42:49 SAST] Watcher: Performing startup scan
+[2014-05-13 08:42:50 SAST] Upgrader: An upgrade of git-annex is available.  (version 5.20140421)
+(started...) [2014-05-13 13:31:46 SAST] NetWatcherFallback: Syncing with box.com, gitannexbackup 
+
+git-annex: /etc/resolv.conf: openFile: does not exist (No such file or directory)
+[2014-05-13 18:34:12 SAST] NetWatcherFallback: Syncing with box.com, gitannexbackup 
+[2014-05-13 19:34:12 SAST] NetWatcherFallback: Syncing with box.com, gitannexbackup 
+[2014-05-13 19:46:48 SAST] main: starting assistant version 5.20140420-ga25b8bb
+Already up-to-date.
+
+(scanning...) [2014-05-13 19:50:06 SAST] Watcher: Performing startup scan
+
+### What steps will reproduce the problem?
+I don't know, simply saw the error in my logs.
+
+### What version of git-annex are you using? On what operating system?
+Version: 5.20140420-ga25b8bb 
+Build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
+Maac OSX 10.9.2
+
+### 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.
+"""]]
diff --git a/doc/bugs/Upgrade_impossible_om_Mac_OSX/comment_4_e3b5bc815376383bbd1f312cc1c32a41._comment b/doc/bugs/Upgrade_impossible_om_Mac_OSX/comment_4_e3b5bc815376383bbd1f312cc1c32a41._comment
new file mode 100644
index 000000000..e55d370d9
--- /dev/null
+++ b/doc/bugs/Upgrade_impossible_om_Mac_OSX/comment_4_e3b5bc815376383bbd1f312cc1c32a41._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 4"
+ date="2014-05-16T17:36:10Z"
+ content="""
+\"Cannot find old distribution bundle; not upgrading\"
+
+This message means that git-annex was unable to find where the old version was installed, which it needs to do in order to replace it with the new version. It looks for a `git-annex.app` directory, and could not find one. How did you install the old version, and to what location?
+
+I think it might try to upload the dmg file to a repository if that repository is set as a full backup and so wants all files even ones not in the work tree.
+"""]]
diff --git a/doc/bugs/how_to_get_git-annex_shell_on_MAC__63__/comment_1_780fbb7b8dda331503064dfa6bcabaa3._comment b/doc/bugs/how_to_get_git-annex_shell_on_MAC__63__/comment_1_780fbb7b8dda331503064dfa6bcabaa3._comment
new file mode 100644
index 000000000..5d7dd9493
--- /dev/null
+++ b/doc/bugs/how_to_get_git-annex_shell_on_MAC__63__/comment_1_780fbb7b8dda331503064dfa6bcabaa3._comment
@@ -0,0 +1,23 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 1"
+ date="2014-05-16T17:17:54Z"
+ content="""
+Here's how I do it:
+
+<pre>
+$ oberon:tmp joeyh$ hdiutil attach git-annex.dmg
+$ oberon:tmp joeyh$  /Volumes/git-annex/git-annex.app/Contents/MacOS/git-annex version
+git-annex version: 5.20140516-g693a6a4
+oberon:tmp joeyh$ PATH=$PATH:/Volumes/git-annex/git-annex.app/Contents/MacOS/
+oberon:tmp joeyh$ git-annex version
+git-annex version: 5.20140516-g693a6a4
+</pre>
+
+So, adding to PATH works fine. Perhaps you added the wrong directory to your PATH.
+
+Note that .bash_profile is only used for bash login shells. It may not be run when you open a terminal, or when git-annex ssh's in from elsewhere to run git-annex-shell (which you seem to be asking about, but only in the title of this page?).
+
+In particular, bash does not provide any way to set the PATH which works when you run \"ssh yourcomputer git-annex-shell\". So you will need to instead move the git-annex files into a directory that is in the default PATH.
+"""]]
diff --git a/doc/bugs/how_to_get_git-annex_shell_on_MAC__63__/comment_2_1785e99846998aa50e1c62a88b558196._comment b/doc/bugs/how_to_get_git-annex_shell_on_MAC__63__/comment_2_1785e99846998aa50e1c62a88b558196._comment
new file mode 100644
index 000000000..e5d09ec64
--- /dev/null
+++ b/doc/bugs/how_to_get_git-annex_shell_on_MAC__63__/comment_2_1785e99846998aa50e1c62a88b558196._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
+ nickname="Ovidiu"
+ subject="comment 2"
+ date="2014-05-16T17:23:32Z"
+ content="""
+Thanks for the additional info, for now its working fine: 
+
+git-annex version
+git-annex version: 5.20140420-ga25b8bb
+build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
+key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
+remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
+"""]]
diff --git a/doc/bugs/standalone_tarball_symlink_to_PATH_broken/comment_1_c9b41b957df03fadf76d93b23508b85e._comment b/doc/bugs/standalone_tarball_symlink_to_PATH_broken/comment_1_c9b41b957df03fadf76d93b23508b85e._comment
new file mode 100644
index 000000000..4bfe563be
--- /dev/null
+++ b/doc/bugs/standalone_tarball_symlink_to_PATH_broken/comment_1_c9b41b957df03fadf76d93b23508b85e._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 1"
+ date="2014-05-16T17:20:22Z"
+ content="""
+Also note that bash goes out of its way to make it stupidly hard for users to add things to PATH. There are different dotfiles that it reads in different situations, and no dotfile it reads in all situations. In particular, \"ssh somebox git-annex-shell\" will avoid reading any dotfiles that could set PATH, AFAICS.
+"""]]
diff --git a/doc/forum/GitBlit_as_a_centralized_repository/comment_1_06bedf5fbac45415e0cc81f41b25a5a0._comment b/doc/forum/GitBlit_as_a_centralized_repository/comment_1_06bedf5fbac45415e0cc81f41b25a5a0._comment
new file mode 100644
index 000000000..91dac6305
--- /dev/null
+++ b/doc/forum/GitBlit_as_a_centralized_repository/comment_1_06bedf5fbac45415e0cc81f41b25a5a0._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 1"
+ date="2014-05-16T17:40:20Z"
+ content="""
+I assume gitblit is something like gitosis or gitolite. These let a user ssh in to a server to access a git repository, but they limit the commands they can run to `git-shell`. In order to use git-annex get/copy to such a repository, it needs to be able to run `git-annex-shell`, which is like git-shell but with more commands available. If gitblit can be made allow git-annex-shell to be run, it will work.
+"""]]
diff --git a/doc/forum/Storing_git_repos_in_git-annex/comment_1_ac7b52c0b0f75d79760ffe6a9b5c8759._comment b/doc/forum/Storing_git_repos_in_git-annex/comment_1_ac7b52c0b0f75d79760ffe6a9b5c8759._comment
new file mode 100644
index 000000000..cb5b39ffc
--- /dev/null
+++ b/doc/forum/Storing_git_repos_in_git-annex/comment_1_ac7b52c0b0f75d79760ffe6a9b5c8759._comment
@@ -0,0 +1,20 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 1"
+ date="2014-05-16T17:29:15Z"
+ content="""
+Why not just use git the way it's designed: Make a git repository on one computer. Clone to another computer. Commit changes on either whenever you like, and pull/push whenever you like. No need for any dropbox to help git sync, it can do so perfectly well on its own.
+
+If you have a lot of repositories, see <http://myrepos.branchable.com/>
+
+I continue to be unimpressed and unmotived by this use case. Posting more forum threads with the same lame reasons won't help. But at least you did say:
+
+> For some time I used Bazaar repos inside Dropbox.  A couple of times I accidentally modified files on one computer before another finished syncing
+, and the repo became mildly corrupted, but I recovered it okay.
+
+> Recently I switched to git, and so far, so good.  I'm careful not to make any changes to my files before Dropbox is finished syncing, so everythin
+g works fine.
+
+So, you used dropbox, and corrupted data.  But that was ok. And now you're very careful to avoid doing things that will corrupt data. But that's ok. Yeah, that seems like a really good decision, given all the excellent possibilities out there.`</snark>`
+"""]]
diff --git a/doc/forum/folder_size_question/comment_1_782cbf836335d86ff29853c34f00fec3._comment b/doc/forum/folder_size_question/comment_1_782cbf836335d86ff29853c34f00fec3._comment
new file mode 100644
index 000000000..36bb93df3
--- /dev/null
+++ b/doc/forum/folder_size_question/comment_1_782cbf836335d86ff29853c34f00fec3._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 1"
+ date="2014-05-16T17:02:29Z"
+ content="""
+I don't have bandwidth to watch screencasts, so I can only guess.
+
+My first guess would be that you used `git add` to check the files into a git repository. This will exactly double the disk space, since each file is now stored in .git/ as well as in the working tree. This is a problem that git-annex solves.
+
+If you'd like to provide more information (cut and paste of details is useful), I can perhaps make more informed guesses. Or you could use `du` so see which files are taking up more space than you expect.
+"""]]
diff --git a/doc/forum/folder_size_question/comment_2_391aa62e4d8c496a58be4707522d8edb._comment b/doc/forum/folder_size_question/comment_2_391aa62e4d8c496a58be4707522d8edb._comment
new file mode 100644
index 000000000..f031deb81
--- /dev/null
+++ b/doc/forum/folder_size_question/comment_2_391aa62e4d8c496a58be4707522d8edb._comment
@@ -0,0 +1,22 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
+ nickname="Ovidiu"
+ subject="comment 2"
+ date="2014-05-16T17:15:59Z"
+ content="""
+I don't recall doing anything besides using the git annex assistant...
+
+That link is just a screen shot...
+
+anyway here is more info:
+
+du -h -s git-annex/*
+ 38M	git-annex/Finance
+8.0K	git-annex/archive
+
+BUT if I check the folder git-annex's properties it says: 
+
+45 980 806 bytes (80,4 MB on disk) for 8 420 items
+
+Is that normal?
+"""]]
diff --git a/doc/forum/git-annex:_map:_1_failed/comment_2_b0826073ebbd2847f4ab0d9bdba2dce5._comment b/doc/forum/git-annex:_map:_1_failed/comment_2_b0826073ebbd2847f4ab0d9bdba2dce5._comment
new file mode 100644
index 000000000..b8841dd36
--- /dev/null
+++ b/doc/forum/git-annex:_map:_1_failed/comment_2_b0826073ebbd2847f4ab0d9bdba2dce5._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
+ nickname="Ovidiu"
+ subject="comment 2"
+ date="2014-05-16T17:21:09Z"
+ content="""
+indeed I didn't have it... was it stated somewhere that I need it?
+
+Busy installing it now... going to kill my 3g Connection :-/
+
+sudo port install graphviz
+--->  Computing dependencies for graphviz
+--->  Dependencies to be installed: autoconf m4 automake fontconfig freetype gd2 jpeg libvpx tiff xpm xorg-libXext xorg-libX11 xorg-kbproto xorg-libXau xorg-xproto xorg-libXdmcp xorg-libxcb xorg-libpthread-stubs xorg-xcb-proto xorg-xextproto xorg-libXt xorg-libsm xorg-libice gts netpbm jasper jbigkit libLASi pango Xft2 xrender xorg-renderproto cairo libpixman xorg-xcb-util gobject-introspection libtool harfbuzz graphite2 poppler curl lcms2 openjpeg15 poppler-data urw-fonts webp xorg-libXaw xorg-libXmu
+"""]]