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

8 files changed, 310 insertions, 0 deletions

diff --git a/doc/bugs/git-annex_broken_on_Android_4.3/comment_3_ddc9cbae1a721400a9acf2153e18f4f0._comment b/doc/bugs/git-annex_broken_on_Android_4.3/comment_3_ddc9cbae1a721400a9acf2153e18f4f0._comment
new file mode 100644
index 000000000..14eed81c9
--- /dev/null
+++ b/doc/bugs/git-annex_broken_on_Android_4.3/comment_3_ddc9cbae1a721400a9acf2153e18f4f0._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkgedYqmQb4dJU7UdVuRLwsQE-KlKVrFto"
+ nickname="Chungy"
+ subject="comment 3"
+ date="2013-09-01T00:25:15Z"
+ content="""
+Just confirming the bug on my Verizon Galaxy S 3 with CyanogenMod 10.2 (Android 4.3), it's not Nexus-specific.
+"""]]
diff --git a/doc/bugs/git-annex_broken_on_Android_4.3/comment_4_593235735e32238094121b1f79355bbd._comment b/doc/bugs/git-annex_broken_on_Android_4.3/comment_4_593235735e32238094121b1f79355bbd._comment
new file mode 100644
index 000000000..ab721064a
--- /dev/null
+++ b/doc/bugs/git-annex_broken_on_Android_4.3/comment_4_593235735e32238094121b1f79355bbd._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawntVnR-Z5ghYInvsElbDeADPSuCsF18iTY"
+ nickname="Thomas"
+ subject="comment 4"
+ date="2013-09-01T20:02:59Z"
+ content="""
+Yet another confirmation of the bug on a Samsung Galaxy Note running 4.3 via Cyanogenmod as well. 
+"""]]
diff --git a/doc/bugs/git-annex_broken_on_Android_4.3/comment_5_f806fd5930e90920db24456297465bae._comment b/doc/bugs/git-annex_broken_on_Android_4.3/comment_5_f806fd5930e90920db24456297465bae._comment
new file mode 100644
index 000000000..cfb75bdd8
--- /dev/null
+++ b/doc/bugs/git-annex_broken_on_Android_4.3/comment_5_f806fd5930e90920db24456297465bae._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://edheil.wordpress.com/"
+ ip="173.162.44.162"
+ subject="comment 5"
+ date="2013-09-03T14:38:51Z"
+ content="""
+If there's anything we can do to help debug this, please let us know.  Have just started using git-annex on android recently & would love to have it on all my devices.
+
+"""]]
diff --git a/doc/devblog/day_-4__forgetting/comment_1_f3cc7a25af4c59fda3924c737a789419._comment b/doc/devblog/day_-4__forgetting/comment_1_f3cc7a25af4c59fda3924c737a789419._comment
new file mode 100644
index 000000000..4c926c1af
--- /dev/null
+++ b/doc/devblog/day_-4__forgetting/comment_1_f3cc7a25af4c59fda3924c737a789419._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="Sandra.Devil"
+ ip="77.172.73.184"
+ subject="New laptop"
+ date="2013-09-01T09:38:32Z"
+ content="""
+What is the new laptop you are going to use? Specs please :) 
+"""]]
diff --git a/doc/forum/Box.com_hasn__39__t_been_working_for_a_few_days.mdwn b/doc/forum/Box.com_hasn__39__t_been_working_for_a_few_days.mdwn
new file mode 100644
index 000000000..77b092891
--- /dev/null
+++ b/doc/forum/Box.com_hasn__39__t_been_working_for_a_few_days.mdwn
@@ -0,0 +1,72 @@
+I've been experiencing problems with Box.com for a few days now and I don't know what's causing them. Is anyone else experiencing anything similar?
+
+I paste the log.
+
+    [2013-09-02 12:27:26 CEST] TransferWatcher: transfer finishing: Transfer {transferDirection = Upload, transferUUID = UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9", transferKey = Key {keyName = "c9e1d5421e78924c21e3d68e84f80a8d1f64f9488020107ca0eeee0c4f10e763.py", keyBackendName = "SHA256E", keySize = Just 1891, keyMtime = Nothing}}
+    [2013-09-02 12:27:26 CEST] TransferScanner: queued Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/kgp/kant.xml Nothing : expensive scan found missing object
+    [2013-09-02 12:27:26 CEST] Transferrer: Transferring: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/argecho.py Nothing
+    [2013-09-02 12:27:26 CEST] TransferWatcher: transfer starting: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/argecho.py Nothing
+    [2013-09-02 12:27:26 CEST] TransferWatcher: transfer starting: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/argecho.py Nothing
+    
+    
+    100%          0.0 B/s 0s[2013-09-02 12:27:26 CEST] TransferWatcher: transfer starting: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/argecho.py Just 437
+    ResponseTimeout
+    ResponseTimeout
+    
+                            
+    [2013-09-02 12:27:44 CEST] TransferWatcher: transfer finishing: Transfer {transferDirection = Upload, transferUUID = UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9", transferKey = Key {keyName = "dd3cc45d91430c6f7d68eb807f4ac1561cd0297b11a2de77b5fe66017d125798.py", keyBackendName = "SHA256E", keySize = Just 437, keyMtime = Nothing}}
+    [2013-09-02 12:27:44 CEST] TransferScanner: queued Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/kgp/kgp.dtd Nothing : expensive scan found missing object
+    [2013-09-02 12:27:44 CEST] Transferrer: Transferring: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/autosize.py Nothing
+    [2013-09-02 12:27:44 CEST] TransferWatcher: transfer starting: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/autosize.py Nothing
+    [2013-09-02 12:27:44 CEST] TransferWatcher: transfer starting: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/autosize.py Nothing
+    
+    
+    100%          0.0 B/s 0s[2013-09-02 12:27:44 CEST] TransferWatcher: transfer starting: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/autosize.py Just 2861
+    ResponseTimeout
+    ResponseTimeout
+    
+                            
+    [2013-09-02 12:28:02 CEST] TransferWatcher: transfer finishing: Transfer {transferDirection = Upload, transferUUID = UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9", transferKey = Key {keyName = "d6b7940ac68768a8e37e72f248e2d94f19fb0d47062084d9baf0ec08cebbf692.py", keyBackendName = "SHA256E", keySize = Just 2861, keyMtime = Nothing}}
+    [2013-09-02 12:28:02 CEST] TransferScanner: queued Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/kgp/kgp.py Nothing : expensive scan found missing object
+    [2013-09-02 12:28:02 CEST] Transferrer: Transferring: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/builddialectexamples.py Nothing
+    [2013-09-02 12:28:03 CEST] TransferWatcher: transfer starting: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/builddialectexamples.py Nothing
+    [2013-09-02 12:28:03 CEST] TransferWatcher: transfer starting: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/builddialectexamples.py Nothing
+    
+    
+    100%          0.0 B/s 0s[2013-09-02 12:28:03 CEST] TransferWatcher: transfer starting: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/builddialectexamples.py Just 1090
+    ResponseTimeout
+    ResponseTimeout
+    
+                            
+    [2013-09-02 12:28:21 CEST] TransferWatcher: transfer finishing: Transfer {transferDirection = Upload, transferUUID = UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9", transferKey = Key {keyName = "f1492b80d05b96cc7cf2904d461c99d430fa86a4eb1d99f1b155c9147ff4420f.py", keyBackendName = "SHA256E", keySize = Just 1090, keyMtime = Nothing}}
+    [2013-09-02 12:28:21 CEST] TransferScanner: queued Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/kgp/russiansample.xml Nothing : expensive scan found missing object
+    [2013-09-02 12:28:21 CEST] Transferrer: Transferring: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/colorize.py Nothing
+    [2013-09-02 12:28:21 CEST] TransferWatcher: transfer starting: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/colorize.py Nothing
+    [2013-09-02 12:28:21 CEST] TransferWatcher: transfer starting: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/colorize.py Nothing
+    
+    
+    100%          0.0 B/s 0s[2013-09-02 12:28:21 CEST] TransferWatcher: transfer starting: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/colorize.py Just 4864
+    ResponseTimeout
+    ResponseTimeout
+    
+    
+    [2013-09-02 12:28:40 CEST] TransferWatcher: transfer finishing: Transfer {transferDirection = Upload, transferUUID = UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9", transferKey = Key {keyName = "b577eaf8b6ddbf9fef866c455cae248aec3b22e3f2e91aa2b75ece90f1801689.py", keyBackendName = "SHA256E", keySize = Just 4864, keyMtime = Nothing}}
+    [2013-09-02 12:28:40 CEST] TransferScanner: queued Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/kgp/stderr.py Nothing : expensive scan found missing object
+    [2013-09-02 12:28:40 CEST] Transferrer: Transferring: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/dialect.py Nothing
+    [2013-09-02 12:28:40 CEST] TransferWatcher: transfer starting: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/dialect.py Nothing
+    [2013-09-02 12:28:40 CEST] TransferWatcher: transfer starting: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/dialect.py Nothing
+    
+    
+    100%          0.0 B/s 0s[2013-09-02 12:28:40 CEST] TransferWatcher: transfer starting: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/dialect.py Just 4449
+    ResponseTimeout
+    ResponseTimeout
+    
+                            
+    [2013-09-02 12:28:58 CEST] TransferWatcher: transfer finishing: Transfer {transferDirection = Upload, transferUUID = UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9", transferKey = Key {keyName = "c5e5d9b1bee2710c7ed05270a363d3e93270b0fb6779c4c8d59ace06c11db684.py", keyBackendName = "SHA256E", keySize = Just 4449, keyMtime = Nothing}}
+    [2013-09-02 12:28:58 CEST] TransferScanner: queued Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/kgp/stdout.py Nothing : expensive scan found missing object
+    [2013-09-02 12:28:58 CEST] Transferrer: Transferring: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/fibonacci.py Nothing
+    [2013-09-02 12:28:58 CEST] TransferWatcher: transfer starting: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/fibonacci.py Nothing
+    [2013-09-02 12:28:58 CEST] TransferWatcher: transfer starting: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/fibonacci.py Nothing
+
+
+    100%          0.0 B/s 0s[2013-09-02 12:28:58 CEST] TransferWatcher: transfer starting: Upload UUID "72111b4c-28fe-42fd-a77b-e4cb9240a1c9" Documentos/diveintopython-5.4/py/fibonacci.py Just 532
diff --git a/doc/forum/Box.com_hasn__39__t_been_working_for_a_few_days/comment_1_6ca872c241399b9129cf9a18f42ebd43._comment b/doc/forum/Box.com_hasn__39__t_been_working_for_a_few_days/comment_1_6ca872c241399b9129cf9a18f42ebd43._comment
new file mode 100644
index 000000000..2c7d98b49
--- /dev/null
+++ b/doc/forum/Box.com_hasn__39__t_been_working_for_a_few_days/comment_1_6ca872c241399b9129cf9a18f42ebd43._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://sunny256.sunbase.org/"
+ nickname="sunny256"
+ subject="It works here"
+ date="2013-09-02T11:47:00Z"
+ content="""
+I set up a box.com remote a couple of months ago or so just for testing. Haven't used it that much, but I tested it now to see if it still works. No errors or problems. I have pasted the output from a session where I copied a file to box.com, dropped it locally, then got it back from box.com here: <https://gist.github.com/sunny256/6411972>. The computer I ran the test on is using the newest git-annex binary (v4.20130827), Ubuntu 10.04.4 LTS. Pretty old distro, but it still works.
+"""]]
diff --git a/doc/forum/Help_Windows_walkthrough.mdwn b/doc/forum/Help_Windows_walkthrough.mdwn
new file mode 100644
index 000000000..dbe61b556
--- /dev/null
+++ b/doc/forum/Help_Windows_walkthrough.mdwn
@@ -0,0 +1,177 @@
+Hello,
+
+i am trying to run the walkthrough on Windows 7. When i try to get the contents of a file, i only get a some git annex text string and not the real file. Both repositories are on the same ntfs filesystem. 
+
+C:\tmp>git annex version  
+git-annex version: 4.20130827-g4f18612  
+build flags: Pairing Testsuite S3 WebDAV DNS  
+local repository version: 4  
+default repository version: 3  
+supported repository versions: 3 4  
+upgrade supported from repository versions: 2  
+  
+C:\tmp\server>git --version  
+git version 1.8.3.msysgit.0  
+   
+
+# walkthrough.bat
+    
+    doskey /history > commands.log
+    mkdir laptop
+    cd laptop
+    git init
+    git annex init laptop
+    cd ..
+    
+    git clone laptop server
+    cd server
+    git annex init server
+    git remote add laptop c:\tmp\laptop
+    
+    cd ..\laptop
+    git remote add server c:\tmp\server
+    copy ..\1.pdf .
+    git annex add 1.pdf
+    git commit -m add
+    dir 
+    
+    cd ..\server
+    dir
+    git fetch laptop
+    git merge laptop/master
+    git annex get 1.pdf
+    dir
+    type 1.pdf
+    
+
+# walkthrough.log
+
+    C:\tmp>walkthrough.bat
+    
+    C:\tmp>doskey /history  1>commands.log
+    
+    C:\tmp>mkdir laptop
+    
+    C:\tmp>cd laptop
+    
+    C:\tmp\laptop>git init
+    Initialized empty Git repository in C:/tmp/laptop/.git/
+    
+    C:\tmp\laptop>git annex init laptop
+    init laptop
+      Detected a crippled filesystem.
+    
+      Enabling direct mode.
+    
+      Detected a filesystem without fifo support.
+    
+      Disabling ssh connection caching.
+    ok
+    (Recording state in git...)
+    
+    C:\tmp\laptop>cd ..
+    
+    C:\tmp>git clone laptop server
+    Cloning into 'server'...
+    done.
+    warning: remote HEAD refers to nonexistent ref, unable to checkout.
+    
+    
+    C:\tmp>cd server
+    
+    C:\tmp\server>git annex init server
+    init server
+      Detected a crippled filesystem.
+    
+      Enabling direct mode.
+    
+      Detected a filesystem without fifo support.
+    
+      Disabling ssh connection caching.
+    ok
+    (Recording state in git...)
+    
+    C:\tmp\server>git remote add laptop c:\tmp\laptop
+    
+    C:\tmp\server>cd ..\laptop
+    
+    C:\tmp\laptop>git remote add server c:\tmp\server
+    
+    C:\tmp\laptop>copy ..\1.pdf .
+            1 file(s) copied.
+    
+    C:\tmp\laptop>git annex add 1.pdf
+    add 1.pdf (checksum...) ok
+    (Recording state in git...)
+    
+    C:\tmp\laptop>git commit -m add
+    [master (root-commit) 7ad1514] add
+     1 file changed, 1 insertion(+)
+     create mode 120000 1.pdf
+    
+    C:\tmp\laptop>dir
+     Volume in drive C has no label.
+     Volume Serial Number is x
+    
+     Directory of C:\tmp\laptop
+    
+    09/01/2013  11:03 AM    <DIR>          .
+    09/01/2013  11:03 AM    <DIR>          ..
+    08/30/2013  12:43 PM            37,500 1.pdf
+                   1 File(s)         37,500 bytes
+                   2 Dir(s)   7,698,817,024 bytes free
+    
+    C:\tmp\laptop>cd ..\server
+    
+    C:\tmp\server>dir
+     Volume in drive C has no label.
+     Volume Serial Number is x
+    
+     Directory of C:\tmp\server
+    
+    09/01/2013  11:03 AM    <DIR>          .
+    09/01/2013  11:03 AM    <DIR>          ..
+                   0 File(s)              0 bytes
+                   2 Dir(s)   7,698,817,024 bytes free
+    
+    C:\tmp\server>git fetch laptop
+    remote: Counting objects: 9, done.
+    remote: Compressing objects: 100% (6/6), done.
+    remote: Total 8 (delta 1), reused 0 (delta 0)
+    Unpacking objects: 100% (8/8), done.
+    From c:\tmp\laptop
+     * [new branch]      git-annex  -> laptop/git-annex
+     * [new branch]      master     -> laptop/master
+    
+    C:\tmp\server>git merge laptop/master
+    
+    C:\tmp\server>git annex get 1.pdf
+    get 1.pdf (merging laptop/git-annex origin/git-annex into git-annex...)
+    (Recording state in git...)
+    (from laptop...)
+    1.pdf
+           37500 100%    4.51MB/s    0:00:00 (xfer#1, to-check=0/1)
+    
+    sent 37573 bytes  received 31 bytes  75208.00 bytes/sec
+    total size is 37500  speedup is 1.00
+    ok
+    (Recording state in git...)
+    
+    C:\tmp\server>dir
+     Volume in drive C has no label.
+     Volume Serial Number is x
+    
+     Directory of C:\tmp\server
+    
+    09/01/2013  11:03 AM    <DIR>          .
+    09/01/2013  11:03 AM    <DIR>          ..
+    09/01/2013  11:03 AM               194 1.pdf
+                   1 File(s)            194 bytes
+                   2 Dir(s)   7,698,767,872 bytes free
+    
+    C:\tmp\server>type 1.pdf
+    .git/annex/objects/kM/0q/SHA256E-s37500--32d8190c7e189d45f48245a100e4cc981ea1bbc
+    02ac8bfa6188db73e41ce06f3.pdf/SHA256E-s37500--32d8190c7e189d45f48245a100e4cc981e
+    a1bbc02ac8bfa6188db73e41ce06f3.pdfC:\tmp\server>
+    C:\tmp\server>
+    
diff --git a/doc/forum/howto_update_feed/comment_4_f040e31b763fc9a7aa092442b4d6b8e8._comment b/doc/forum/howto_update_feed/comment_4_f040e31b763fc9a7aa092442b4d6b8e8._comment
new file mode 100644
index 000000000..f7a35d1b6
--- /dev/null
+++ b/doc/forum/howto_update_feed/comment_4_f040e31b763fc9a7aa092442b4d6b8e8._comment
@@ -0,0 +1,20 @@
+[[!comment format=mdwn
+ username="arand"
+ ip="130.243.226.21"
+ subject="comment 4"
+ date="2013-09-01T18:06:51Z"
+ content="""
+Yet another solution, keeping it all in one script
+
+    #!/bin/sh
+    
+    while IFS= read line
+    do
+            test -n \"${line%%#*}\" && echo git annex importfeed --relaxed \"$line\"
+    done <<EOF
+    # FooCast - Alice & Bob
+    http://feeds.foo.com/foocast
+    # FrobCast
+    http://meep.moop.com/feed
+    EOF
+"""]]