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

12 files changed, 216 insertions, 1 deletions

diff --git a/doc/bugs/Assistant_lost_dbus_connection_spamming_log/comment_9_278b41aaa73a214b2b38881242a29b17._comment b/doc/bugs/Assistant_lost_dbus_connection_spamming_log/comment_9_278b41aaa73a214b2b38881242a29b17._comment
new file mode 100644
index 000000000..e43f03f03
--- /dev/null
+++ b/doc/bugs/Assistant_lost_dbus_connection_spamming_log/comment_9_278b41aaa73a214b2b38881242a29b17._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://schnouki.net/"
+ nickname="Schnouki"
+ subject="comment 9"
+ date="2014-03-09T16:29:26Z"
+ content="""
+I did some more testing today.
+
+I have this message when using either git-annex assistant or git-annex webapp. When running the webapp, I can connect to its port, but there's no response from git-annex (either from a browser or when using telnet to send a simple \"GET / HTTP/1.0\").
+
+The accept message comes every second, the dbus one very minute (didn't test long enough last time, sorry about that).
+"""]]
diff --git a/doc/bugs/Auto-repair_greatly_slows_down_the_machine/comment_6_93ed991ef2a74c18575073ca72e06185._comment b/doc/bugs/Auto-repair_greatly_slows_down_the_machine/comment_6_93ed991ef2a74c18575073ca72e06185._comment
new file mode 100644
index 000000000..05935b034
--- /dev/null
+++ b/doc/bugs/Auto-repair_greatly_slows_down_the_machine/comment_6_93ed991ef2a74c18575073ca72e06185._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns"
+ nickname="Jan Ulrich"
+ subject="comment 6"
+ date="2014-03-10T14:14:06Z"
+ content="""
+I manually ran git fsck without problems but git-annex still wants to repair something.
+"""]]
diff --git a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__.mdwn b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__.mdwn
new file mode 100644
index 000000000..2fb3d970b
--- /dev/null
+++ b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__.mdwn
@@ -0,0 +1,40 @@
+### Please describe the problem.
+
+I plugged in a usb drive, did git annex sync and it git fast-forward and deleted about 600 files that I had added on my laptop. 
+
+### What steps will reproduce the problem?
+
+Obviously, I'm not sure really because I don't plug this usb drive every day to sync so I don't remember what I did last time. But I suppose I just finished with git annex sync and unplugged it. When the accident occured:
+
+ 1. The usb drive was in direct mode whereas the laptop was in indirect mode at the time. 
+ 2. I git annex sync the usb drive
+ 3. I git annex sync the laptop
+
+Anyway, the big mistake I did was syncing the laptop as well, naively thinking it would correct the usb drive; but instead it also deleted the files on the laptop. I had a back up of most of it so it was okay.
+
+---
+
+So now I git reset --hard to a commit before I synced, so I still have my files. But how can I fix this situation?
+
+### What version of git-annex are you using? On what operating system?
+
+Arch Linux
+
+git-annex version: 5.20140128
+build flags: S3 DBus 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 glacier hook external
+local repository version: 5
+supported repository version: 5
+upgrade supported from repository versions: 0 1 2 4
+
+
+### 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/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_1_e25451863622eefed664f6a210cbe67d._comment b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_1_e25451863622eefed664f6a210cbe67d._comment
new file mode 100644
index 000000000..f0abd4507
--- /dev/null
+++ b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_1_e25451863622eefed664f6a210cbe67d._comment
@@ -0,0 +1,72 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawno-jcsScu4CK6k2QLZqxMros1PQHf1NQY"
+ nickname="Hugo"
+ subject="Sync messed up"
+ date="2014-03-09T12:16:32Z"
+ content="""
+So, I have now reseted to a previous commit all the branches: git-annex, master, synced/git-annex and synced/master in other usb drives. i can git pull and git push, etc. But every time I try a git annex sync, it's deleting files again.
+
+For instance:
+
+```````````````
+(merging laptop/git-annex laptop/synced/git-annex into git-annex...)
+(Recording state in git...)
+commit  ok
+pull wdrouge 
+Depuis /run/media/hrd/WD-rouge/annex/hrd
+ * [nouvelle branche] git-annex  -> wdrouge/git-annex
+   e5894a1..f5af709  master     -> wdrouge/master
+ * [nouvelle branche] synced/git-annex -> wdrouge/synced/git-annex
+ * [nouvelle branche] synced/master -> wdrouge/synced/master
+ok
+pull origin 
+Depuis /home/hrd
+ + 93d883b...f5af709 git-annex  -> origin/git-annex  (mise à jour forcée)
+   e5894a1..f5af709  master     -> origin/master
+ + c8c2481...f5af709 synced/git-annex -> origin/synced/git-annex  (mise à jour forcée)
+   1d2a028..ac708e3  synced/master -> origin/synced/master
+ * [nouvelle étiquette] should-be-fine-here -> should-be-fine-here
+
+Mise à jour f5af709..ac708e3
+Fast-forward
+
+→ a bunch of files
+ 621 files changed, 22 insertions(+), 599 deletions(-)
+ delete mode 120000 → the bunch of files……………
+ …
+ delete mode 120000 org/gtd.org_archive
+ok
+pull laptop 
+Depuis /home/hrd
+ + 93d883b...f5af709 git-annex  -> laptop/git-annex  (mise à jour forcée)
+ + c8c2481...f5af709 synced/git-annex -> laptop/synced/git-annex  (mise à jour forcée)
+   1d2a028..ac708e3  synced/master -> laptop/synced/master
+
+Already up-to-date.
+ok
+push wdrouge 
+Counting objects: 6609, done.
+Delta compression using up to 4 threads.
+Compressing objects: 100% (3057/3057), done.
+Writing objects: 100% (3331/3331), 511.27 KiB | 0 bytes/s, done.
+Total 3331 (delta 2091), reused 0 (delta 0)
+To /run/media/hrd/WD-rouge/annex/hrd
+   f5af709..16f17bf  git-annex -> synced/git-annex
+   f5af709..ac708e3  master -> synced/master
+ok
+push origin 
+Counting objects: 6569, done.
+Delta compression using up to 4 threads.
+Compressing objects: 100% (3056/3056), done.
+Writing objects: 100% (3330/3330), 511.05 KiB | 0 bytes/s, done.
+Total 3330 (delta 2091), reused 0 (delta 0)
+To /home/hrd/
+   f5af709..16f17bf  git-annex -> synced/git-annex
+ok
+push laptop 
+Everything up-to-date
+ok
+git annex sync  14.33s user 1.87s system 74% cpu 21.696 total
+``````````````````
+
+"""]]
diff --git a/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_2_f49e6f4016b3a6f918961a2412902e03._comment b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_2_f49e6f4016b3a6f918961a2412902e03._comment
new file mode 100644
index 000000000..277a72b63
--- /dev/null
+++ b/doc/bugs/git_annex_sync_deleted_a_bunch_of_files___40__not_expected__41__/comment_2_f49e6f4016b3a6f918961a2412902e03._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 2"
+ date="2014-03-10T17:11:41Z"
+ content="""
+Your laptop is in indirect mode, so we know that the only way files can be deleted by a merge is if a commit was made to git that deletes the files.
+
+My conclusion is that some repository, perhaps the usb drive, made a commit that deleted those files. You should be able to find this commit with `git log --stat`, and can just `git revert` it if you want to.
+
+So far, I don't see evidence of a bug. For all I know, you actually did delete the files on the usb drive, and that change got committed..
+"""]]
diff --git a/doc/devblog/day_130__post_release.mdwn b/doc/devblog/day_130__post_release.mdwn
index 547f28a93..b6a2af6c8 100644
--- a/doc/devblog/day_130__post_release.mdwn
+++ b/doc/devblog/day_130__post_release.mdwn
@@ -4,7 +4,7 @@ updated today.
 
 Post release bug triage including:
 
-Added a nice peice of UI to the webapp on user request: A "Sync now" menu
+Added a nice piece of UI to the webapp on user request: A "Sync now" menu
 item in the repository for each repo. (The one for the current repo syncs with
 all its remotes.)
 
diff --git a/doc/forum/How_do_I_get_rid_of_a_wrong_remote_uuid__63__/comment_1_b3c215cedba51fb47992ef10c60d6acc._comment b/doc/forum/How_do_I_get_rid_of_a_wrong_remote_uuid__63__/comment_1_b3c215cedba51fb47992ef10c60d6acc._comment
new file mode 100644
index 000000000..80b664dce
--- /dev/null
+++ b/doc/forum/How_do_I_get_rid_of_a_wrong_remote_uuid__63__/comment_1_b3c215cedba51fb47992ef10c60d6acc._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://alan.petitepomme.net/"
+ nickname="Alan Schmitt"
+ subject="comment 1"
+ date="2014-03-08T06:42:29Z"
+ content="""
+If it helps, I had a look at \"git annex vicfg\", and there is no mention of the extra UUID there.
+"""]]
diff --git a/doc/forum/Too_big_to_fsck/comment_6_0997f1a94c2fda9fe69824e074011518._comment b/doc/forum/Too_big_to_fsck/comment_6_0997f1a94c2fda9fe69824e074011518._comment
new file mode 100644
index 000000000..ddf69f94b
--- /dev/null
+++ b/doc/forum/Too_big_to_fsck/comment_6_0997f1a94c2fda9fe69824e074011518._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o"
+ nickname="Aaron"
+ subject="comment 6"
+ date="2014-03-08T00:08:22Z"
+ content="""
+That seemed to work, thanks:
+
+    $ git fsck --no-reflogs |wc
+    Checking object directories: 100% (256/256), done.
+    error: refs/gcrypt/gitception+ does not point to a valid object!
+    error: refs/remotes/Beta/git-annex does not point to a valid object!
+    error: refs/remotes/Beta/master does not point to a valid object!
+    Checking connectivity: 128728, done.
+     369082 1165340 20898546
+
+Thanks for your help!
+"""]]
diff --git a/doc/forum/drop_old_versions_of_a_file.mdwn b/doc/forum/drop_old_versions_of_a_file.mdwn
new file mode 100644
index 000000000..95f103dcc
--- /dev/null
+++ b/doc/forum/drop_old_versions_of_a_file.mdwn
@@ -0,0 +1,3 @@
+I have a music repository which has multiple versions of a music file(modified id3 tags etc,.) and in my music player same file is showing two times with two different id3 tags, one is from music directory and another is from .git-annex directory which is a older version(which I don't want to see).
+
+I was just wondering if there is a way I can drop old version of a file in android(direct mode).
diff --git a/doc/forum/git_annex_with_local_apache_webdav_server/comment_2_d8e9237cf6e7f7558f836ba1352f5517._comment b/doc/forum/git_annex_with_local_apache_webdav_server/comment_2_d8e9237cf6e7f7558f836ba1352f5517._comment
new file mode 100644
index 000000000..2b60a9967
--- /dev/null
+++ b/doc/forum/git_annex_with_local_apache_webdav_server/comment_2_d8e9237cf6e7f7558f836ba1352f5517._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawm7hS2LGu4sLUxLMdBA16PAMcVO7CDJmjw"
+ nickname="Damien"
+ subject="comment 2"
+ date="2014-03-10T12:16:43Z"
+ content="""
+I'm curious if anyone has set this up using a local apache webdav server?
+
+I'm stuck and could use some insight.
+
+thanks
+Damien
+"""]]
diff --git a/doc/forum/sync_between_indirect_and_direct_mode.mdwn b/doc/forum/sync_between_indirect_and_direct_mode.mdwn
new file mode 100644
index 000000000..66833cbe5
--- /dev/null
+++ b/doc/forum/sync_between_indirect_and_direct_mode.mdwn
@@ -0,0 +1,6 @@
+I have a music repository(direct mode) in my Nexus 5 which I want to sync with remote repository(indirect mode).
+
+When I run 'git annex sync --content', it did not sync the content but when I changed remote repository to direct mode, content got synced.
+
+Do I need to set some configuration ?
+Is it possible to sync content between direct and indirect mode repositories ?
diff --git a/doc/todo/required_content/comment_1_42620a3c958666be2a0d5f5b8eadf7b4._comment b/doc/todo/required_content/comment_1_42620a3c958666be2a0d5f5b8eadf7b4._comment
new file mode 100644
index 000000000..7d490a9d7
--- /dev/null
+++ b/doc/todo/required_content/comment_1_42620a3c958666be2a0d5f5b8eadf7b4._comment
@@ -0,0 +1,23 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
+ nickname="Richard"
+ subject="comment 1"
+ date="2014-03-10T17:15:54Z"
+ content="""
+To give a specific example of what I want to do:
+
+I have a bunch of repos
+
+* A, Machine1 -- anchor repository and sometimes used to add new content
+* B, Machine2 -- anchor repository, offsite
+* C, External1 -- anchor repository, stored off-site
+* D, Laptop -- transient repo to carry data around and to add new content
+* E, USB1 -- transient, travel backups
+* F, USB2 -- transient, travel backups
+
+A-C should get _all_ data. A-F trust A-C to always retain all data, online checks for availability are not needed because A-C run frequent fsck. Ideally, `git annex drop` should be no-op in A-C.
+
+D-F should retain data as long as it's not been saved in _all_ of A-C. As soon as A-C have copies, `git annex drop` in D-F should drop that content; before that, they _must not_ drop said content.
+
+Richard
+"""]]