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

3 files changed, 33 insertions, 1 deletions

diff --git a/doc/bugs/Assistant_dropping_from_backup_repo/comment_1_c13d86fb2541676ee4ca1446b99e0e68._comment b/doc/bugs/Assistant_dropping_from_backup_repo/comment_1_c13d86fb2541676ee4ca1446b99e0e68._comment
new file mode 100644
index 000000000..5e69655e0
--- /dev/null
+++ b/doc/bugs/Assistant_dropping_from_backup_repo/comment_1_c13d86fb2541676ee4ca1446b99e0e68._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://edheil.wordpress.com/"
+ ip="173.162.44.162"
+ subject="comment 1"
+ date="2013-03-12T14:25:16Z"
+ content="""
+This sounds very similar to [[http://git-annex.branchable.com/bugs/__39__client__39___repo_starts_pulling_in___39__archive__39___content/]]; my client was pulling in content prior to dropping it from a \"backup\" repo on a USB drive.
+"""]]
diff --git a/doc/bugs/addurl_--relaxed_with_--file_doesn__39__t_actually_relax.mdwn b/doc/bugs/addurl_--relaxed_with_--file_doesn__39__t_actually_relax.mdwn
new file mode 100644
index 000000000..09e91f380
--- /dev/null
+++ b/doc/bugs/addurl_--relaxed_with_--file_doesn__39__t_actually_relax.mdwn
@@ -0,0 +1,24 @@
+It appears like addurl --relaxed if used incombination with --file doesn't actually relax.
+
+(I'm interested in quickly adding links to an extremely large set of files (and for a large set of revisions), and the fact that addurl takes a second or so per file makes this impossible performance-wise.)
+
+What steps will reproduce the problem? (Well, this isn't the problem per see, but it illustrates that it does checking)
+
+    $ echo foo > foo
+    $ git annex add foo
+    $ git annex addurl --relaxed http://lambda.haskell.org/platform/download/2012.4.0.0/haskell-platform-2012.4.0.0.tar.gz --file foo
+    addurl foo 
+      failed to verify url: http://lambda.haskell.org/platform/download/2012.4.0.0/haskell-platform-2012.4.0.0.tar.gz
+    failed
+    git-annex: addurl: 1 failed
+
+What version of git-annex are you using? On what operating system?
+
+Debian Sid
+
+    git-annex version: 4.20130228
+    local repository version: 3
+    default repository version: 3
+    supported repository versions: 3 4
+    upgrade supported from repository versions: 0 1 2
+    build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 8013c3769..80002b414 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -155,7 +155,7 @@ subdirectories).
   To avoid immediately downloading the url, specify --fast.
 
   To avoid storing the size of the url's content, and accept whatever
-  is there at a future point, specific --relaxed. (Implies --fast.)
+  is there at a future point, specify --relaxed. (Implies --fast.)
 
   Normally the filename is based on the full url, so will look like
   "www.example.com_dir_subdir_bigfile". For a shorter filename, specify