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

6 files changed, 112 insertions, 0 deletions

diff --git a/doc/bugs/assistant_cannot_set_up_remote_repo_via_an_ssh_alias_or_an_ip_address/comment_1_1650539846521ae11837e4ac73348af6._comment b/doc/bugs/assistant_cannot_set_up_remote_repo_via_an_ssh_alias_or_an_ip_address/comment_1_1650539846521ae11837e4ac73348af6._comment
new file mode 100644
index 000000000..859810a44
--- /dev/null
+++ b/doc/bugs/assistant_cannot_set_up_remote_repo_via_an_ssh_alias_or_an_ip_address/comment_1_1650539846521ae11837e4ac73348af6._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://edheil.wordpress.com/"
+ ip="99.54.57.201"
+ subject="comment 1"
+ date="2013-01-06T05:23:25Z"
+ content="""
+Fair enough. :)  Power user solution to power user whine!
+
+"""]]
diff --git a/doc/bugs/git-annex_direct_fails_on_repositories_with_a_partial_set_of_files.mdwn b/doc/bugs/git-annex_direct_fails_on_repositories_with_a_partial_set_of_files.mdwn
new file mode 100644
index 000000000..278eb1e0f
--- /dev/null
+++ b/doc/bugs/git-annex_direct_fails_on_repositories_with_a_partial_set_of_files.mdwn
@@ -0,0 +1,24 @@
+## What steps will reproduce the problem?
+
+Running the following in an annex with an archive directory with all the files dropped and located offsite
+
+     git annex direct
+
+It seems that if not all the files are in the annex, then the direct mode files.
+
+## What is the expected output? What do you see instead?
+
+The expectation is that either direct mode reverts its changes if it fails instead of
+
+    url: createLink: does not exist (No such file or directory)
+    failed
+    git-annex: direct: 1 failed
+
+It leaves the annex in the indirect mode, but there are a bunch of .map files lying around in git-annex's control directory.
+
+## What version of git-annex are you using? On what operating system?
+
+Running 3.20130102 on OSX
+
+## Please provide any additional information below.
+
diff --git a/doc/bugs/webapp_raise_an_internal_server_error_upon_creating_the_initial_repo.mdwn b/doc/bugs/webapp_raise_an_internal_server_error_upon_creating_the_initial_repo.mdwn
new file mode 100644
index 000000000..5377d07f2
--- /dev/null
+++ b/doc/bugs/webapp_raise_an_internal_server_error_upon_creating_the_initial_repo.mdwn
@@ -0,0 +1,23 @@
+What steps will reproduce the problem?
+
+Fresh install on a 12.40 xubuntu with
+
+    cabal install git-annex --bindir=$HOME/bin
+
+What is the expected output? What do you see instead?
+
+I launched the git-annex webapp (the assistant) and the system proposed to create a git-annex repository: I choose ~/annex/ and clicked on "Make repositiry" but I got:
+
+    Internal Server Error
+
+    user error (git ["--git-dir=/home/m/annex/.git","--work-tree=/home/m/annex","commit-tree","4b825dc642cb6eb9a060e54bf8d69288fbee4904"] exited 128)
+
+    git-annex version 3.20130102
+ 
+What version of git-annex are you using? On what operating system?
+
+git-annex version 3.20130102 on Xubuntu 12.04, installed with cabal (got no errors).
+
+Please provide any additional information below.
+
+I do not know if there is any log, or any info about the reason of the failure. Something useful could be that  ~/annex/ now contains an empty git repository, so "something" happened despite the error.
diff --git a/doc/bugs/webapp_raise_an_internal_server_error_upon_creating_the_initial_repo/comment_1_1bcf0f565eacac851bd21cd428c8e0a5._comment b/doc/bugs/webapp_raise_an_internal_server_error_upon_creating_the_initial_repo/comment_1_1bcf0f565eacac851bd21cd428c8e0a5._comment
new file mode 100644
index 000000000..fbf63a97c
--- /dev/null
+++ b/doc/bugs/webapp_raise_an_internal_server_error_upon_creating_the_initial_repo/comment_1_1bcf0f565eacac851bd21cd428c8e0a5._comment
@@ -0,0 +1,33 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.152.108.211"
+ subject="comment 1"
+ date="2013-01-06T17:00:40Z"
+ content="""
+There should be an error message on either the terminal where you started git-annex, or in ~/.xsession-errors if you started it from a GUI menu. 
+
+Without the error message, this seems most likely to be another case of git commit failing due to not being able to determine the user's full name. For example, if I delete my full name out of /etc/passwd, 
+
+<pre>
+describe . ok
+(Recording state in git...)
+
+*** Please tell me who you are.
+
+Run
+
+  git config --global user.email \"you@example.com\"
+  git config --global user.name \"Your Name\"
+
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
+
+fatal: empty ident  joey@gnu.kitenet.net
+  not allowed
+
+git-annex: user error (git [\"--git-dir=/home/joey/tmp/r/.git\",\"--work-tree=/home/joey/tmp/r\",\"commit-tree\",\"5316749be9efffeee538051b576166291c516472\",\"-p\",\"refs/heads/git-annex\"] exited 128)
+failed
+</pre>
+
+I'm perfectly comfortable with command-line git-annex not working if the system is so misconfigured; after all git tells the user one way to fix it. Perhaps though it's worth the assistant holding the user's hand here and detecting this problem.
+"""]]
diff --git a/doc/forum/Calculating_Annex_Cost_by_Ping_Times/comment_2_7e04f85c6ba74c18c8dde148aef9bf80._comment b/doc/forum/Calculating_Annex_Cost_by_Ping_Times/comment_2_7e04f85c6ba74c18c8dde148aef9bf80._comment
new file mode 100644
index 000000000..7dc4072eb
--- /dev/null
+++ b/doc/forum/Calculating_Annex_Cost_by_Ping_Times/comment_2_7e04f85c6ba74c18c8dde148aef9bf80._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q"
+ nickname="Andrew"
+ subject="comment 2"
+ date="2013-01-06T11:08:42Z"
+ content="""
+Yeah, I was debating between ping times (max or avg) and hop count and ultimately went with ping time because of this situation: From my office to my house is ~12 hops but because we peer with the cable modem provider the ping time is still ~5ms. But from my cell modem, it's ~8 hops but ping times of ~200ms.
+"""]]
diff --git a/doc/news/version_3.20130102/comment_1_585984e1b116c20c58db3d8434ef9f62._comment b/doc/news/version_3.20130102/comment_1_585984e1b116c20c58db3d8434ef9f62._comment
new file mode 100644
index 000000000..7c7db9fb1
--- /dev/null
+++ b/doc/news/version_3.20130102/comment_1_585984e1b116c20c58db3d8434ef9f62._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawm7AuSfii_tCkLyspL6Mr0ATlO6OxLNYOo"
+ nickname="Georg"
+ subject="cabal install fails to install a 20130105 version"
+ date="2013-01-06T08:30:42Z"
+ content="""
+Not seen an announcement for that version, but cabal install fails currently on my machine with the following:
+
+    Assistant/WebApp/Configurators/Local.hs:55:11:
+        `fieldEnctype' is not a (visible) field of constructor `Field'
+    cabal: Error: some packages failed to install:
+    git-annex-3.20130105 failed during the building phase. The exception was:
+    ExitFailure 1
+
+"""]]