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

5 files changed, 57 insertions, 0 deletions

diff --git a/doc/assistant/comment_1_f2c4857b7b000e005f0c19279db14eaf._comment b/doc/assistant/comment_1_f2c4857b7b000e005f0c19279db14eaf._comment
new file mode 100644
index 000000000..1ed185e48
--- /dev/null
+++ b/doc/assistant/comment_1_f2c4857b7b000e005f0c19279db14eaf._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkYrMBMTCEFUKskhWGD-1pzcw2ITshsi_8"
+ nickname="Robert"
+ subject="Annex on OS X 10.6"
+ date="2013-06-04T23:10:03Z"
+ content="""
+I really hope they can get annex working on os x 10.6.  This is a great effort.  Thanks 
+"""]]
diff --git a/doc/bugs/Can__39__t_clone_on_Windows_because_some_filenames_have_a_colon_in_them.mdwn b/doc/bugs/Can__39__t_clone_on_Windows_because_some_filenames_have_a_colon_in_them.mdwn
new file mode 100644
index 000000000..2d03b7b57
--- /dev/null
+++ b/doc/bugs/Can__39__t_clone_on_Windows_because_some_filenames_have_a_colon_in_them.mdwn
@@ -0,0 +1,18 @@
+### Please describe the problem.
+Some filenames in doc have a colon `(:)` in them and it seems it's not allowed on Windows.
+
+There's no hurry with this since I was able to clone the repo by doing a fork on Github and removing `doc/`.
+
+### What steps will reproduce the problem?
+
+[[!format sh """
+D:\tmp> git clone git://git-annex.branchable.com/
+Cloning into 'git-annex.branchable.com'...
+remote: Counting objects: 72064, done.
+remote: Compressing objects: 100% (18759/18759), done.
+remote: Total 72064 (delta 52959), reused 72032 (delta 52944)
+Receiving objects: 100% (72064/72064), 18.05 MiB | 2.39 MiB/s, done.
+Resolving deltas: 100% (52959/52959), done.
+fatal: cannot create directory at 'doc/bugs/3.20121112:_build_error_in_assistant': Invalid argument
+D:\tmp>
+"""]]
diff --git a/doc/design/assistant/blog/day_280__yesod/comment_1_a42213a8cef71f2b54db18606028136d._comment b/doc/design/assistant/blog/day_280__yesod/comment_1_a42213a8cef71f2b54db18606028136d._comment
new file mode 100644
index 000000000..3a99c2210
--- /dev/null
+++ b/doc/design/assistant/blog/day_280__yesod/comment_1_a42213a8cef71f2b54db18606028136d._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM"
+ nickname="Bruno"
+ subject="comment 1"
+ date="2013-06-04T12:51:20Z"
+ content="""
+Congrats on the first year Joey!
+"""]]
diff --git a/doc/forum/help_running_git-annex_on_top_of_existing_repo/comment_2_b5e94c10ebbed9125c7e2332f75709ca._comment b/doc/forum/help_running_git-annex_on_top_of_existing_repo/comment_2_b5e94c10ebbed9125c7e2332f75709ca._comment
new file mode 100644
index 000000000..ba321df6b
--- /dev/null
+++ b/doc/forum/help_running_git-annex_on_top_of_existing_repo/comment_2_b5e94c10ebbed9125c7e2332f75709ca._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl9FMhhhM2sJ68Zjx_RmWd8cTdpI-mrkbE"
+ nickname="Hans"
+ subject="what about with git-svn?"
+ date="2013-06-04T08:00:15Z"
+ content="""
+I'm trying to wrap my head around a similar situation.
+I've tested this by git cloning my repo; the symlinks are copied, and end up broken because the annex directory under .git doesn't exist in the new repo.
+
+So to be specific: can I conclude that when I use git to copy my repo, as long as I don't explicitly use git-annex in the process, I end up with a 'bare' git repo and I don't have to worry about my annexed files coming along?
+
+Also: anyone know of anything that would be different about using git-svn? (i.e. git svn dcommit to push my changes to an svn repo)?
+"""]]
diff --git a/doc/forum/help_running_git-annex_on_top_of_existing_repo/comment_3_2b3b93bbc60fbc24d436231954d6822a._comment b/doc/forum/help_running_git-annex_on_top_of_existing_repo/comment_3_2b3b93bbc60fbc24d436231954d6822a._comment
new file mode 100644
index 000000000..8d2fd0dff
--- /dev/null
+++ b/doc/forum/help_running_git-annex_on_top_of_existing_repo/comment_3_2b3b93bbc60fbc24d436231954d6822a._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://edheil.wordpress.com/"
+ ip="173.162.44.162"
+ subject="comment 3"
+ date="2013-06-04T12:29:04Z"
+ content="""
+As long as you're not using Direct Mode, then a git-annex repo is just an absolutely ordinary git repo, which happens to contain some symlinks that point to .git/annex/objects/*
+
+
+"""]]