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

5 files changed, 62 insertions, 0 deletions

diff --git a/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_5_2de7f6532de4cbc21737ce53a89d6525._comment b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_5_2de7f6532de4cbc21737ce53a89d6525._comment
new file mode 100644
index 000000000..a08bd2899
--- /dev/null
+++ b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_5_2de7f6532de4cbc21737ce53a89d6525._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 5"
+ date="2013-06-18T00:09:58Z"
+ content="""
+I have followed the transcript (on my linux system), and cannot reproduce the non-fast-forward problem.
+
+What error does fsck throw in fixLink?
+"""]]
diff --git a/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_6_80d130b5af829763be77c61a9c5ca306._comment b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_6_80d130b5af829763be77c61a9c5ca306._comment
new file mode 100644
index 000000000..6c05e5665
--- /dev/null
+++ b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_6_80d130b5af829763be77c61a9c5ca306._comment
@@ -0,0 +1,29 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmhfodZquCI_EEl-f3h7HkROTszlsQL6yA"
+ nickname="Joe"
+ subject="comment 6"
+ date="2013-06-18T00:25:53Z"
+ content="""
+The transcript also works fine on my linux machine.
+
+This is the git annex fsck error:
+
+[[!format sh \"\"\"
+
+(fixing content location) looking for mapping\"C:\\joe\\backup\\repo-bak\\.git\\a
+nnex\\objects\\fba\\8bb\\SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd
+78762e80a45f0bbece05f.txt\\SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5c
+cd78762e80a45f0bbece05f.txt.map\"
+
+git-annex: C:\joe\backup\repo-bak\.git/annex/objects/3V/kM/SHA256E-s7--eef0e2920
+0a3194851e5fb4ff77d0d0aec5cd3f5ccd78762e80a45f0bbece05f.txt/SHA256E-s7--eef0e292
+00a3194851e5fb4ff77d0d0aec5cd3f5ccd78762e80a45f0bbece05f.txt: renameFile: does n
+ot exist (No such file or directory)
+failed
+git-annex: fsck: 1 failed
+
+
+\"\"\"]]
+
+As such it can't get to verifyDirectMapping to corrrect the missing mapping
+"""]]
diff --git a/doc/forum/clear_box.com_repository/comment_4_f8c06ac9b23b51cf18d362c260fc47a9._comment b/doc/forum/clear_box.com_repository/comment_4_f8c06ac9b23b51cf18d362c260fc47a9._comment
new file mode 100644
index 000000000..a36ca1237
--- /dev/null
+++ b/doc/forum/clear_box.com_repository/comment_4_f8c06ac9b23b51cf18d362c260fc47a9._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="tomas"
+ ip="188.167.111.235"
+ subject="comment 4"
+ date="2013-06-17T20:17:30Z"
+ content="""
+Hi, I cannot enable debug logging via webapp, because after restart the checkbox is unchecked again. I saw nothing at all in logs after restart, the box repo is still hanging there. I would prefer using command line to remove the last traces of this repository. 
+Another similar question - how do I unassociate two repositories? The web app warns me that about deleting repo, not sure if it would also wipe it out. Is there a CLI command to add and remove the associations (git remote rm?)? Overall great work, but I am lost with the webapp. It is good for learning the concepts, but I would love to know which commands it actually executes on the backend to make the gui -> cli transition easier.
+
+Version: 4.20130516.1
+Build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP
+
+"""]]
diff --git a/doc/forum/clear_box.com_repository/comment_5_61d401b29322802cb25896503f3e6514._comment b/doc/forum/clear_box.com_repository/comment_5_61d401b29322802cb25896503f3e6514._comment
new file mode 100644
index 000000000..122e054a9
--- /dev/null
+++ b/doc/forum/clear_box.com_repository/comment_5_61d401b29322802cb25896503f3e6514._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 5"
+ date="2013-06-17T23:53:24Z"
+ content="""
+Use the --debug switch to enable debugging on startup.
+"""]]
diff --git a/doc/forum/multiple_routes_to_same_repository.mdwn b/doc/forum/multiple_routes_to_same_repository.mdwn
new file mode 100644
index 000000000..a94acac2f
--- /dev/null
+++ b/doc/forum/multiple_routes_to_same_repository.mdwn
@@ -0,0 +1,2 @@
+I am trying to configure the local repo to be connected with remote computer. It can either find this computer on local network using local host name, or go through public IP host where I have ssh tunnel. First confusing thing is, that when setting up remote server, it successfuly establishes connection, but then asks me if the folder should be git or rsync - I believe this step should be skipped if the git repo is already there. Also choosing repository group should be detected from the repo itself.
+But the real problem is that I cannot add the public IP repo at all. Is this a known limitation?