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

9 files changed, 151 insertions, 0 deletions

diff --git a/doc/bugs/Building_on_OpenBSD.mdwn b/doc/bugs/Building_on_OpenBSD.mdwn
new file mode 100644
index 000000000..36dc2b19f
--- /dev/null
+++ b/doc/bugs/Building_on_OpenBSD.mdwn
@@ -0,0 +1,38 @@
+### Please describe the problem.
+Hi!
+I just tried to build git-annex through cabal on OpenBSD and encountered some issues.
+
+First I had to install a certain commit of network-info that fixes some compile-time errors (https://github.com/jystic/network-info/issues/6)
+Then I had to disable WebDAV in git-annex because DAV wouldn't build (I don't use webdav anyway)
+
+After this git-annex still failed to build, though configure works.
+### What steps will reproduce the problem?
+Compiling on openbsd through cabal
+
+### What version of git-annex are you using? On what operating system?
+git-annex-5.20131130 on OpenBSD 5.4
+
+### Please provide any additional information below.
+
+[[!format sh """
+The error in question:
+[312 of 389] Compiling Assistant.Pairing.Network ( Assistant/Pairing/Network.hs, dist/build/git-annex/git-annex-tmp/Assistant/Pairing/Network.o )
+
+Assistant/Pairing/Network.hs:101:21:
+    Not in scope: type constructor or class `IPv4'
+
+Assistant/Pairing/Network.hs:102:21:
+    Not in scope: data constructor `IPv4'
+
+Assistant/Pairing/Network.hs:104:21:
+    Not in scope: type constructor or class `IPv6'
+
+Assistant/Pairing/Network.hs:105:21:
+    Not in scope: data constructor `IPv6'
+
+Assistant/Pairing/Network.hs:108:32:
+    Not in scope: data constructor `IPv4'
+
+Assistant/Pairing/Network.hs:109:47:
+    Not in scope: data constructor `IPv6'
+"""]]
diff --git a/doc/bugs/when_syncing_a_direct_repository__44___git_annex_delete_non_annexed_new_git_files/comment_2_04dfbf4b1f6b545075d50f43b1d73ef6._comment b/doc/bugs/when_syncing_a_direct_repository__44___git_annex_delete_non_annexed_new_git_files/comment_2_04dfbf4b1f6b545075d50f43b1d73ef6._comment
new file mode 100644
index 000000000..e0ff4c5c5
--- /dev/null
+++ b/doc/bugs/when_syncing_a_direct_repository__44___git_annex_delete_non_annexed_new_git_files/comment_2_04dfbf4b1f6b545075d50f43b1d73ef6._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmLdL4zLty4fsfaIXNtPMS5RXs4y8OAk0o"
+ nickname="Marc"
+ subject="Similar problem"
+ date="2013-12-08T12:30:12Z"
+ content="""
+I've described the same (or similar) problem here:
+http://git-annex.branchable.com/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant/#comment-015d93573c7c34d10f3815a22bdc13c0
+"""]]
diff --git a/doc/devblog/day_74__so_close/comment_1_b1aa185734c3d74830b81def4fe63bff._comment b/doc/devblog/day_74__so_close/comment_1_b1aa185734c3d74830b81def4fe63bff._comment
new file mode 100644
index 000000000..2abbc8dd3
--- /dev/null
+++ b/doc/devblog/day_74__so_close/comment_1_b1aa185734c3d74830b81def4fe63bff._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://nullroute.eu.org/~grawity/"
+ nickname="Mantas"
+ subject="comment 1"
+ date="2013-12-08T12:52:26Z"
+ content="""
+Take a look at how Process Hacker implements the \"Search for open handles\" function; it is rather close to `lsof`. (Unlocker probably does it the same way, too.)
+
+But locking (e.g. I think the \"share mode\" could prevent other programs from writing but not reading) may be more reliable, if a program starts writing to file *after* the lsof check happens...
+"""]]
diff --git a/doc/forum/Android_-_ext3__47__4__47__....mdwn b/doc/forum/Android_-_ext3__47__4__47__....mdwn
new file mode 100644
index 000000000..5227228a9
--- /dev/null
+++ b/doc/forum/Android_-_ext3__47__4__47__....mdwn
@@ -0,0 +1 @@
+Is there a good way to use a ext4 formated external sdcard on a rooted android with symlinks. If android mounts it (with the sdcard command i think) symlinks don't work. If i mount it with mount the permissions are a problem because every app has a different user.
diff --git a/doc/forum/git_annex_status_doesn__39__t_use_.gitignore_in_direct_mode.mdwn b/doc/forum/git_annex_status_doesn__39__t_use_.gitignore_in_direct_mode.mdwn
new file mode 100644
index 000000000..f91c8bf79
--- /dev/null
+++ b/doc/forum/git_annex_status_doesn__39__t_use_.gitignore_in_direct_mode.mdwn
@@ -0,0 +1,16 @@
+Hello all!
+
+I'm doing tests with git annex to see how it works, and to start with it I'm trying to track my /home using some kind of a *white list* with .gitignore.
+
+So I have this .gitignore file:
+
+    /*
+    !/web
+    
+    !/Desktop
+    /Desktop/*
+    !/Desktop/Work
+
+and when I do *git annex add .* it works as expected: It adds only ~/web and ~/Desktop/Work... but when I do *git annex status* it shows me the entire /home... it seems that *git annex status* doesn't use .gitignore... is this a bug or an intended behavior?
+
+Thanks for your time :)
diff --git a/doc/forum/would_you_call_me_crazy_if_I_use_git_annex_in_direct_mode_to_track_my___47__home__63____63__.mdwn b/doc/forum/would_you_call_me_crazy_if_I_use_git_annex_in_direct_mode_to_track_my___47__home__63____63__.mdwn
new file mode 100644
index 000000000..2332f1bd5
--- /dev/null
+++ b/doc/forum/would_you_call_me_crazy_if_I_use_git_annex_in_direct_mode_to_track_my___47__home__63____63__.mdwn
@@ -0,0 +1,7 @@
+Hello people :)
+
+I'm learning to use git annex and I'm doing some tests to know how it works from an user point of view... My big goal would be to use git annex to track my entire /home directory in direct mode, so I would be able to sync my main computer with my laptop in a really effective way. But of course I feel some fear because things could go wrong and of course I have lots of important files I can't lose —nothing really important since I'll backup that /home in an external hard drive, but it would make me cry if I have to spend some hours restoring my /home :S
+
+So, do you think that tracking all the /home would be a reasonable goal?
+
+Thanks a lot for your time :)
diff --git a/doc/sync/comment_8_b89161c82c05634d35f6b65bf8360a96._comment b/doc/sync/comment_8_b89161c82c05634d35f6b65bf8360a96._comment
new file mode 100644
index 000000000..115a0866a
--- /dev/null
+++ b/doc/sync/comment_8_b89161c82c05634d35f6b65bf8360a96._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkI9AR8BqG4RPw_Ov2lnDCJWMuM6WMRobQ"
+ nickname="Dav"
+ subject="Use case for not syncing to all remotes"
+ date="2013-12-08T19:20:26Z"
+ content="""
+Just in case you haven't considered such a scenario - maybe you have suggestions for how to collaborate more effectively with git annex (and avoid warning messages):
+
+I'm trying to teach beginning scientist programmers (mostly graduate students), and a common scenario is to fork some scientific code. I'd like forking on github to be mundane, and not trigger warnings, and generally have as little for folks to explicitly keep track of as possible (this seems to be a common concern we share, which leads you to prefer syncing to all remotes without the option to configure the default behavior!).
+
+However, I am currently working with students on forking and fixing up scientific code where the upstream maintainer doesn't want to allow pushes upstream, except via pull request. So, part of our approach is to set up some common shared datasets in git annex (and these just end up in our fork). If we have an \"upstream\" remote, git annex will try to sync with it, and report an error.
+
+So - that's why I'd like to be able to configure the deactivation of syncing to a defined branch (e.g., \"upstream\"). However, if you have other suggestions to smooth the workflow, I would also like to hear those!
+"""]]
diff --git a/doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant/comment_8_85765c0cfeb5b326c06cf60c98147cbf._comment b/doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant/comment_8_85765c0cfeb5b326c06cf60c98147cbf._comment
new file mode 100644
index 000000000..466d03e29
--- /dev/null
+++ b/doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant/comment_8_85765c0cfeb5b326c06cf60c98147cbf._comment
@@ -0,0 +1,21 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmLdL4zLty4fsfaIXNtPMS5RXs4y8OAk0o"
+ nickname="Marc"
+ subject="Disappearing files"
+ date="2013-12-08T12:16:37Z"
+ content="""
+I've tried this with version 5.20131130, but my files disappear if I modify them on the remote end.
+
+My setup:
+- A local repository, direct mode, client group, annex.largefiles \"exclude=*.txt\"
+- A remote one, also direct mode, backup group, annex.largefiles \"exclude=*.txt\"
+Both are running the assistant.
+
+If I create a .txt file locally, it gets committed and pushed to the remote as described. But, if I then modify that file on the remote end, the file gets deleted from both repositories. Also, if I create a file on the remote end, it's pushed to the local one (according to the log) but it never appears in the directory.
+
+Changing the remote from 'backup' to 'client' group doesn't seem to make any difference.
+
+Is there a 'best practice' on using git-annex like SparkleShare? I mean, syncing changes on all repositories but keeping a history of changes in git.
+
+Thanks!
+"""]]
diff --git a/doc/todo/New_special_remote_suggeston_-_clean_directory/comment_9_0ba57952532d5ef1f2bbfb163faa3b2f._comment b/doc/todo/New_special_remote_suggeston_-_clean_directory/comment_9_0ba57952532d5ef1f2bbfb163faa3b2f._comment
new file mode 100644
index 000000000..d96ac6987
--- /dev/null
+++ b/doc/todo/New_special_remote_suggeston_-_clean_directory/comment_9_0ba57952532d5ef1f2bbfb163faa3b2f._comment
@@ -0,0 +1,35 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmicVKRM8vJX4wPuAwlLEoS2cjmFXQkjkE"
+ nickname="Thomas"
+ subject="pseudocode"
+ date="2013-12-08T15:23:36Z"
+ content="""
+The implementation should really be nothing more than the following to be run from a regular git annex repository with a configures special plain directory remote:
+
+    foreach(path : allAnnexedFiles) {
+      if(remote.exists(path) && remote.filesize(path) === expectedFilesize) goto finally;
+    
+      if(fileAvailableLocally(path)) {
+        copyFileToRemote(path);
+        goto finally;
+      }
+
+      if(shouldCopyFromElsewhere && canCopyFileFromSomeOtherRemote(path)) {
+        copyFileFromSomeOtherRemoteToRemote(path);
+      }
+
+      finally: 
+        logThatFileExistsOnRemote(path);
+    }
+    
+    foreach(remotePath : filesInRemoteDir) {
+      if(fileIsAnnexed(remotePath) || fileIsIgnored(remotePath) continue;
+    
+      delete(remotePath);
+    }
+
+The above pseude code assumes
+- that the no other process is working on the remote at the same time.
+- that the remote is not trusted.
+- that nobody expects changes done at the remote to propagate to other clones.
+"""]]