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

12 files changed, 685 insertions, 2 deletions

diff --git a/doc/bugs/Deasn__39__t_clean_up_ssh_keys_after_removing_remote_repo.mdwn b/doc/bugs/Deasn__39__t_clean_up_ssh_keys_after_removing_remote_repo.mdwn
new file mode 100644
index 000000000..0899ea467
--- /dev/null
+++ b/doc/bugs/Deasn__39__t_clean_up_ssh_keys_after_removing_remote_repo.mdwn
@@ -0,0 +1,18 @@
+### Please describe the problem.
+I created a remote repo on ssh server with the same git-annex version, no personal ssh keys for the repo (password authentication). But I put ~ in front of the repo name so it created in different place than I wanted. I deleted it from assistant and then deleted the remote repo dir. When I added it with the correct path again it always asks for server password (it has some old annex pub key in authorized_keys, but not the new one; it might have been prompted for the password also with the initial repo). During the whole thing it failed to connect a few times due to wrong password or me realizing too late that it asks for yet another one and it generated keys few times, but ultimately didn't put the last one in remote's authorized_keys.
+
+### What steps will reproduce the problem?
+Create, delete and create again a new repo on remote ssh server with password auth.
+
+### What version of git-annex are you using? On what operating system?
+git-annex 4.20130601 Gentoo amd64
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+
+# End of transcript or log.
+"""]]
diff --git a/doc/bugs/Error_creating_remote_repository_using_ssh_on_OSX/comment_2_a9f4f9db042ab6f6c15d6954651971b2._comment b/doc/bugs/Error_creating_remote_repository_using_ssh_on_OSX/comment_2_a9f4f9db042ab6f6c15d6954651971b2._comment
new file mode 100644
index 000000000..f0d25d778
--- /dev/null
+++ b/doc/bugs/Error_creating_remote_repository_using_ssh_on_OSX/comment_2_a9f4f9db042ab6f6c15d6954651971b2._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="Peng"
+ ip="171.37.79.254"
+ subject="Found an easy solution"
+ date="2013-06-15T03:34:52Z"
+ content="""
+Just install this script on OS X, and you'll get the ssh-askpass command.
+
+https://github.com/markcarver/mac-ssh-askpass
+
+Tested working successfully on OS X 10.8.3.
+"""]]
diff --git a/doc/bugs/Handling_of_files_inside_and_outside_archive_directory_at_the_same_time/comment_2_ead9fa75a12ef36be9a92637b144e74f._comment b/doc/bugs/Handling_of_files_inside_and_outside_archive_directory_at_the_same_time/comment_2_ead9fa75a12ef36be9a92637b144e74f._comment
new file mode 100644
index 000000000..5b355e070
--- /dev/null
+++ b/doc/bugs/Handling_of_files_inside_and_outside_archive_directory_at_the_same_time/comment_2_ead9fa75a12ef36be9a92637b144e74f._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 2"
+ date="2013-06-15T17:52:36Z"
+ content="""
+This turns out to be much worse in direct mode than in indirect mode.
+
+In indirect mode, it only does extra work during the full startup scan. Suppose there are 3 files with the same content, 1, archive/2, and 3. It will download 1, and then will drop archive/2, and then will download 3. This certianly is not ideal, especially when the file content is large.
+
+In indirect mode, it continally and repeatedly downloads the drops the files, as long as it's running. Which is beyond unacceptable.
+
+What seems to be going on is that when archive/2 gets dropped, it necessary needs to convert 1 and 3 to broken symlinks. But the watcher than sees those file changes, thinks these are new or renamed files that have appeared, and promptly re-downloads them. That, in turn triggers an update of archive/2, to convert it back from symlink to direct mode file, and that in turn is noticed by the watcher. Round and round we go!
+"""]]
diff --git a/doc/bugs/Hangs_on_creating_repository_when_using_--listen/comment_1_8cbe786de8cf8b407418149b9c811aab._comment b/doc/bugs/Hangs_on_creating_repository_when_using_--listen/comment_1_8cbe786de8cf8b407418149b9c811aab._comment
new file mode 100644
index 000000000..b0132de65
--- /dev/null
+++ b/doc/bugs/Hangs_on_creating_repository_when_using_--listen/comment_1_8cbe786de8cf8b407418149b9c811aab._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo"
+ nickname="Dirk"
+ subject="comment 1"
+ date="2013-06-15T11:39:15Z"
+ content="""
+Thanks for looking into this.
+
+Following your explanation there is no easy solution to this. I guess one could potentially grey out all actions in the webapp that lead to problems. But that might be overkill for a rare use case (which I assume the use of --listen with a given port is). Maybe just documenting for which use cases (repository creation, switching, ...?) the provided port will lead to problems (e.g. in the man page under the --listen section) is good enough (it is for me)?
+
+ 
+
+
+"""]]
diff --git a/doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex.mdwn b/doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex.mdwn
new file mode 100644
index 000000000..6b7b4d2cc
--- /dev/null
+++ b/doc/bugs/Missing_repo_uuid_after_local_pairing_with_older_annex.mdwn
@@ -0,0 +1,26 @@
+### Please describe the problem.
+I paired my repo running on Gentoo (git-annex 4.20130601) with Ubuntu 13.04 (git-annex 3.10121112ubuntu4). The repo on Ubuntu doesn't have uuid for the Gentoo remote, so:
+
+- There is no name in assistan's repo settings for it
+
+- Trying to access its settings gives Internal server error: Unknown UUID
+15/Jun/2013:12:39:10 +0300 [Error#yesod-core] Unknown UUID @(yesod-core-1.1.8.3:Yesod.Internal.Core ./Yesod/Internal/Core.hs:550:5)
+
+- In dashboard on Ubuntu all changes stay queued forever (although the syncing seems to work)
+
+### What steps will reproduce the problem?
+Pair local computers with different annex versions.
+
+### What version of git-annex are you using? On what operating system?
+Gentoo (git-annex 4.20130601)
+Ubuntu 13.04 (git-annex 3.10121112ubuntu4)
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+
+# End of transcript or log.
+"""]]
diff --git a/doc/bugs/Unable_to_add_files_on_Android_due_to_weird_rename_error/comment_2_6a0cb836b93ba4cb1e07b11d5d2a7094._comment b/doc/bugs/Unable_to_add_files_on_Android_due_to_weird_rename_error/comment_2_6a0cb836b93ba4cb1e07b11d5d2a7094._comment
new file mode 100644
index 000000000..52441b074
--- /dev/null
+++ b/doc/bugs/Unable_to_add_files_on_Android_due_to_weird_rename_error/comment_2_6a0cb836b93ba4cb1e07b11d5d2a7094._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawknOATcOkmzX4jKuET5Z2RsaFUNnLKnQsU"
+ nickname="Stephen"
+ subject="comment 2"
+ date="2013-06-14T23:01:35Z"
+ content="""
+Yep, it's fixed in the latest. Thanks!
+"""]]
diff --git a/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_.mdwn b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_.mdwn
new file mode 100644
index 000000000..84f7717b5
--- /dev/null
+++ b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_.mdwn
@@ -0,0 +1,556 @@
+### Please describe the problem.
+
+Using a centralized remote repository, new files that are added to the repository after it's pulled cannot be directly accessed - instead are pulled as symlinks.
+
+The workaround is to create a new remote repository that clones from the source. That repo can pull all files correctly
+
+### What steps will reproduce the problem?
+
+The following script works fine when everything is run on a linux box. If the same script is run on the windows box, it will not show foo2.txt in the repository clone. foo.txt is still valid.
+
+a file, testrepo.sh is set up on the server to simplify the creation of the repo for testing
+
+**testrepo.sh**
+[[!format sh """
+
+rm -rf repo.git
+git init --bare repo.git
+cd repo.git
+git annex init origin
+git annex sync
+
+
+"""]]
+
+**test script**
+[[!format sh """
+
+ssh joebo@xxxxx sh testrepo.sh
+
+
+rm -rf repo
+git init repo
+cd repo
+
+git annex init
+git remote add origin ssh://joebo@xxxxx/~/repo.git
+echo hello > foo.txt
+git annex add .
+git commit -m "initial commit"
+git annex sync
+git annex copy --to origin
+git annex sync
+
+cd ..
+rm -rf repo-bak
+git init repo-bak
+cd repo-bak
+git remote add origin ssh://joebo@xxxxx/~/repo.git
+git fetch origin
+git merge origin/synced/master
+git annex sync
+git annex get .
+cat foo.txt #works just fine!
+
+cd ..
+cd repo
+echo foo2 > foo2.txt
+git annex add .
+git commit -m "another"
+git annex sync
+git annex copy --to origin
+git annex sync
+
+cd ..
+cd repo-bak
+git annex sync
+
+## throws a fastforward error:
+commit
+ok
+pull origin
+remote: Counting objects: 21, done.
+remote: Compressing objects: 100% (14/14), done.
+remote: Total 16 (delta 3), reused 0 (delta 0)
+Unpacking objects: 100% (16/16), done.
+From ssh://xxxx.com/~/repo
+   c5ed8e1..7ea5586  synced/git-annex -> origin/synced/git-annex
+   a8402ae..1a72b3d  synced/master -> origin/synced/master
+ok
+(merging origin/synced/git-annex into git-annex...)
+(Recording state in git...)
+push origin
+Counting objects: 15, done.
+Delta compression using up to 4 threads.
+Compressing objects: 100% (7/7), done.
+Writing objects: 100% (8/8), 844 bytes, done.
+Total 8 (delta 2), reused 0 (delta 0)
+To ssh://joebo@xxxx.com/~/repo.git
+   7ea5586..5df3c85  git-annex -> synced/git-annex
+ ! [rejected]        master -> synced/master (non-fast-forward)
+error: failed to push some refs to 'ssh://joebo@xxx.com/~/repo.git'
+hint: Updates were rejected because a pushed branch tip is behind its remote
+hint: counterpart. Check out this branch and merge the remote changes
+hint: (e.g. 'git pull') before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+failed
+git-annex: sync: 1 failed
+"""]]
+
+If I try to work around it by merging, then I get the symlink in the file after getting
+
+
+[[!format sh """
+
+C:\joe\backup\repo-bak>git merge origin/synced/master
+Updating f586b6a..fcae7bc
+Fast-forward
+ foo2.txt | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 120000 foo2.txt
+
+C:\joe\backup\repo-bak>git annex get foo2.txt
+get foo2.txt (from origin...)
+SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd78762e80a45f0bbece05f.txt
+
+           7 100%    6.84kB/s    0:00:00 (xfer#1, to-check=0/1)
+
+sent 30 bytes  received 156 bytes  124.00 bytes/sec
+total size is 7  speedup is 0.04
+ok
+warning: LF will be replaced by CRLF in C:\joe\backup\repo-bak\.git\annex\journa
+l\fba_8bb_SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd78762e80a45f0bb
+ece05f.txt.log.
+The file will have its original line endings in your working directory.
+(Recording state in git...)
+
+C:\joe\backup\repo-bak>cat foo2.txt
+.git/annex/objects/3V/kM/SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd
+78762e80a45f0bbece05f.txt/SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5cc
+d78762e80a45f0bbece05f.txt
+
+"""]]
+
+removing the backup repository and starting over works:
+
+[[!format sh """
+
+C:\joe\backup>git init repo-bak
+Initialized empty Git repository in C:/joe/backup/repo-bak/.git/
+
+C:\joe\backup>cd repo-bak
+
+C:\joe\backup\repo-bak>git remote add origin ssh://joebo@xxxx.com/~/repo.git
+
+C:\joe\backup\repo-bak>git fetch origin
+remote: Counting objects: 57, done.
+remote: Compressing objects: 100% (48/48), done.
+remote: Total 57 (delta 20), reused 0 (delta 0)
+Unpacking objects: 100% (57/57), done.
+From ssh://xxxx.com/~/repo
+ * [new branch]      git-annex  -> origin/git-annex
+ * [new branch]      synced/git-annex -> origin/synced/git-annex
+ * [new branch]      synced/master -> origin/synced/master
+
+C:\joe\backup\repo-bak>git merge origin/synced/master
+
+C:\joe\backup\repo-bak>git annex sync
+
+  Detected a crippled filesystem.
+
+  Enabling direct mode.
+
+  Detected a filesystem without fifo support.
+
+  Disabling ssh connection caching.
+warning: LF will be replaced by CRLF in C:\joe\backup\repo-bak\.git\annex\journa
+l\uuid.log.
+The file will have its original line endings in your working directory.
+(merging origin/git-annex origin/synced/git-annex into git-annex...)
+(Recording state in git...)
+commit
+ok
+pull origin
+ok
+push origin
+Counting objects: 9, done.
+Delta compression using up to 4 threads.
+Compressing objects: 100% (4/4), done.
+Writing objects: 100% (5/5), 533 bytes, done.
+Total 5 (delta 3), reused 0 (delta 0)
+To ssh://joebo@xxxx.com/~/repo.git
+   5038806..67d6383  git-annex -> synced/git-annex
+ok
+
+C:\joe\backup\repo-bak>git annex get .
+get foo.txt (from origin...)
+SHA256E-s8--f873eef4f852e335da367d76ce7f1973c15b8ffebf532b064df4bc691cd51a87.txt
+
+           8 100%    7.81kB/s    0:00:00 (xfer#1, to-check=0/1)
+
+sent 30 bytes  received 157 bytes  124.67 bytes/sec
+total size is 8  speedup is 0.04
+ok
+get foo2.txt (from origin...)
+SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd78762e80a45f0bbece05f.txt
+
+           7 100%    6.84kB/s    0:00:00 (xfer#1, to-check=0/1)
+
+sent 30 bytes  received 156 bytes  124.00 bytes/sec
+total size is 7  speedup is 0.04
+ok
+warning: LF will be replaced by CRLF in C:\joe\backup\repo-bak\.git\annex\journa
+l\fba_8bb_SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd78762e80a45f0bb
+ece05f.txt.log.
+The file will have its original line endings in your working directory.
+warning: LF will be replaced by CRLF in C:\joe\backup\repo-bak\.git\annex\journa
+l\ae4_1e9_SHA256E-s8--f873eef4f852e335da367d76ce7f1973c15b8ffebf532b064df4bc691c
+d51a87.txt.log.
+The file will have its original line endings in your working directory.
+(Recording state in git...)
+
+C:\joe\backup\repo-bak>cat *
+hello
+foo2
+
+C:\joe\backup\repo-bak>ls -lah
+total 5.0k
+drwxr-xr-x    1 jbogner  Administ        0 Jun 15 08:44 .
+drwxr-xr-x   23 jbogner  Administ     4.0k Jun 15 08:43 ..
+drwxr-xr-x    1 jbogner  Administ     4.0k Jun 15 08:44 .git
+-rw-r--r--    1 jbogner  Administ        8 Jun 15 08:44 foo.txt
+-rw-r--r--    1 jbogner  Administ        7 Jun 15 08:44 foo2.txt
+
+C:\joe\backup\repo-bak>
+
+"""]]
+
+### What version of git-annex are you using? On what operating system?
+
+Windows:
+
+	C:\joe\backup\repo-bak>git annex version
+	git-annex version: 4.20130614-g3a93e24
+	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
+
+
+Linux:
+
+        git-annex version: 4.20130531-g5df09b5
+	build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP
+
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+C:\joe\backup>cd repo
+
+C:\joe\backup\repo>git annex init
+init
+  Detected a crippled filesystem.
+
+  Enabling direct mode.
+
+  Detected a filesystem without fifo support.
+
+  Disabling ssh connection caching.
+ok
+warning: LF will be replaced by CRLF in C:\joe\backup\repo\.git\annex\journal\uu
+id.log.
+The file will have its original line endings in your working directory.
+(Recording state in git...)
+
+C:\joe\backup\repo>git remote add origin ssh://joebo@xxxx.com/~/repo.git
+
+C:\joe\backup\repo>echo hello  1>foo.txt
+
+C:\joe\backup\repo>git annex add .
+add foo.txt (checksum...) ok
+(Recording state in git...)
+warning: LF will be replaced by CRLF in C:\joe\backup\repo\.git\annex\journal\ae
+4_1e9_SHA256E-s8--f873eef4f852e335da367d76ce7f1973c15b8ffebf532b064df4bc691cd51a
+87.txt.log.
+The file will have its original line endings in your working directory.
+
+C:\joe\backup\repo>git commit -m "initial commit"
+[master (root-commit) 47c05ea] initial commit
+ 1 file changed, 1 insertion(+)
+ create mode 120000 foo.txt
+
+C:\joe\backup\repo>git annex sync
+commit
+ok
+pull origin
+warning: no common commits
+remote: Counting objects: 5, done.
+remote: Compressing objects: 100% (3/3), done.
+remote: Total 5 (delta 1), reused 0 (delta 0)
+Unpacking objects: 100% (5/5), done.
+From ssh://xxxx.com/~/repo
+ * [new branch]      git-annex  -> origin/git-annex
+ok
+(merging origin/git-annex into git-annex...)
+(Recording state in git...)
+push origin
+Counting objects: 18, done.
+Delta compression using up to 4 threads.
+Compressing objects: 100% (12/12), done.
+Writing objects: 100% (16/16), 1.40 KiB, done.
+Total 16 (delta 3), reused 0 (delta 0)
+To ssh://joebo@xxxx.com/~/repo.git
+ * [new branch]      git-annex -> synced/git-annex
+ * [new branch]      master -> synced/master
+ok
+
+C:\joe\backup\repo>git annex copy --to origin
+copy foo.txt (checking origin...) (to origin...)
+foo.txt
+           8 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
+
+sent 79 bytes  received 31 bytes  73.33 bytes/sec
+total size is 8  speedup is 0.07
+ok
+warning: LF will be replaced by CRLF in C:\joe\backup\repo\.git\annex\journal\ae
+4_1e9_SHA256E-s8--f873eef4f852e335da367d76ce7f1973c15b8ffebf532b064df4bc691cd51a
+87.txt.log.
+The file will have its original line endings in your working directory.
+(Recording state in git...)
+
+C:\joe\backup\repo>git annex sync
+commit
+ok
+pull origin
+ok
+push origin
+Counting objects: 9, done.
+Delta compression using up to 4 threads.
+Compressing objects: 100% (4/4), done.
+Writing objects: 100% (5/5), 450 bytes, done.
+Total 5 (delta 1), reused 0 (delta 0)
+To ssh://joebo@xxxx.com/~/repo.git
+   bd52e5f..02a0a4a  git-annex -> synced/git-annex
+ok
+
+C:\joe\backup\repo>cd ..
+
+C:\joe\backup>rm -rf repo-bak
+
+C:\joe\backup>git init repo-bak
+Initialized empty Git repository in C:/joe/backup/repo-bak/.git/
+
+C:\joe\backup>cd repo-bak
+
+C:\joe\backup\repo-bak>git remote add origin ssh://joebo@xxxx.com/~/repo.git
+
+C:\joe\backup\repo-bak>git fetch origin
+remote: Counting objects: 25, done.
+remote: Compressing objects: 100% (19/19), done.
+remote: Total 25 (delta 6), reused 0 (delta 0)
+Unpacking objects: 100% (25/25), done.
+From ssh://xxxx.com/~/repo
+ * [new branch]      git-annex  -> origin/git-annex
+ * [new branch]      synced/git-annex -> origin/synced/git-annex
+ * [new branch]      synced/master -> origin/synced/master
+
+C:\joe\backup\repo-bak>git merge origin/synced/master
+
+C:\joe\backup\repo-bak>git annex sync
+
+  Detected a crippled filesystem.
+
+  Enabling direct mode.
+
+  Detected a filesystem without fifo support.
+
+  Disabling ssh connection caching.
+warning: LF will be replaced by CRLF in C:\joe\backup\repo-bak\.git\annex\journa
+l\uuid.log.
+The file will have its original line endings in your working directory.
+(merging origin/git-annex origin/synced/git-annex into git-annex...)
+(Recording state in git...)
+commit
+ok
+pull origin
+ok
+push origin
+Counting objects: 9, done.
+Delta compression using up to 4 threads.
+Compressing objects: 100% (4/4), done.
+Writing objects: 100% (5/5), 610 bytes, done.
+Total 5 (delta 1), reused 0 (delta 0)
+To ssh://joebo@xxxx.com/~/repo.git
+   02a0a4a..88d19ce  git-annex -> synced/git-annex
+ok
+
+C:\joe\backup\repo-bak>git annex get .
+get foo.txt (from origin...)
+SHA256E-s8--f873eef4f852e335da367d76ce7f1973c15b8ffebf532b064df4bc691cd51a87.txt
+
+           8 100%    7.81kB/s    0:00:00 (xfer#1, to-check=0/1)
+
+sent 30 bytes  received 157 bytes  124.67 bytes/sec
+total size is 8  speedup is 0.04
+ok
+warning: LF will be replaced by CRLF in C:\joe\backup\repo-bak\.git\annex\journa
+l\ae4_1e9_SHA256E-s8--f873eef4f852e335da367d76ce7f1973c15b8ffebf532b064df4bc691c
+d51a87.txt.log.
+The file will have its original line endings in your working directory.
+(Recording state in git...)
+
+C:\joe\backup\repo-bak>cat foo.txt
+hello
+
+C:\joe\backup\repo-bak>cd ..
+
+C:\joe\backup>cd repo
+
+C:\joe\backup\repo>echo foo2  1>foo2.txt
+
+C:\joe\backup\repo>git annex add .
+add foo2.txt (checksum...) ok
+(Recording state in git...)
+warning: LF will be replaced by CRLF in C:\joe\backup\repo\.git\annex\journal\fb
+a_8bb_SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd78762e80a45f0bbece0
+5f.txt.log.
+The file will have its original line endings in your working directory.
+
+C:\joe\backup\repo>git commit -m "another"
+[master 76a9e44] another
+ 1 file changed, 1 insertion(+)
+ create mode 120000 foo2.txt
+
+C:\joe\backup\repo>git annex sync
+commit
+ok
+pull origin
+remote: Counting objects: 9, done.
+remote: Compressing objects: 100% (4/4), done.
+remote: Total 5 (delta 1), reused 0 (delta 0)
+Unpacking objects: 100% (5/5), done.
+From ssh://xxxx.com/~/repo
+   02a0a4a..88d19ce  synced/git-annex -> origin/synced/git-annex
+ok
+(merging origin/synced/git-annex into git-annex...)
+(Recording state in git...)
+push origin
+Counting objects: 16, done.
+Delta compression using up to 4 threads.
+Compressing objects: 100% (10/10), done.
+Writing objects: 100% (11/11), 1.11 KiB, done.
+Total 11 (delta 2), reused 0 (delta 0)
+To ssh://joebo@xxxx.com/~/repo.git
+   88d19ce..f47091a  git-annex -> synced/git-annex
+   47c05ea..76a9e44  master -> synced/master
+ok
+
+C:\joe\backup\repo>git annex copy --to origin
+copy foo.txt (checking origin...) ok
+copy foo2.txt (checking origin...) (to origin...)
+foo2.txt
+           7 100%    0.00kB/s    0:00:00 (xfer#1, to-check=0/1)
+
+sent 79 bytes  received 31 bytes  73.33 bytes/sec
+total size is 7  speedup is 0.06
+ok
+warning: LF will be replaced by CRLF in C:\joe\backup\repo\.git\annex\journal\fb
+a_8bb_SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd78762e80a45f0bbece0
+5f.txt.log.
+The file will have its original line endings in your working directory.
+(Recording state in git...)
+
+C:\joe\backup\repo>git annex sync
+commit
+ok
+pull origin
+ok
+push origin
+Counting objects: 9, done.
+Delta compression using up to 4 threads.
+Compressing objects: 100% (4/4), done.
+Writing objects: 100% (5/5), 477 bytes, done.
+Total 5 (delta 1), reused 0 (delta 0)
+To ssh://joebo@xxxx.com/~/repo.git
+   f47091a..98082cb  git-annex -> synced/git-annex
+ok
+
+C:\joe\backup\repo>cd ..
+
+C:\joe\backup>cd repo-bak
+
+C:\joe\backup\repo-bak>git annex sync
+commit
+ok
+pull origin
+remote: Counting objects: 21, done.
+remote: Compressing objects: 100% (14/14), done.
+remote: Total 16 (delta 4), reused 0 (delta 0)
+Unpacking objects: 100% (16/16), done.
+From ssh://xxxx.com/~/repo
+   88d19ce..98082cb  synced/git-annex -> origin/synced/git-annex
+   47c05ea..76a9e44  synced/master -> origin/synced/master
+ok
+(merging origin/synced/git-annex into git-annex...)
+(Recording state in git...)
+push origin
+Counting objects: 15, done.
+Delta compression using up to 4 threads.
+Compressing objects: 100% (7/7), done.
+Writing objects: 100% (8/8), 843 bytes, done.
+Total 8 (delta 2), reused 0 (delta 0)
+To ssh://joebo@xxxx.com/~/repo.git
+   98082cb..2537203  git-annex -> synced/git-annex
+ ! [rejected]        master -> synced/master (non-fast-forward)
+error: failed to push some refs to 'ssh://joebo@xxxx.com/~/repo.git'
+hint: Updates were rejected because a pushed branch tip is behind its remote
+hint: counterpart. Check out this branch and merge the remote changes
+hint: (e.g. 'git pull') before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+failed
+git-annex: sync: 1 failed
+
+C:\joe\backup\repo-bak>git annex get foo2.txt
+git-annex: foo2.txt not found
+
+C:\joe\backup\repo-bak>cat foo2.txt
+cat: foo2.txt: No such file or directory
+C:\joe\backup\repo-bak>git pull origin synced/master
+From ssh://xxxx.com/~/repo
+ * branch            synced/master -> FETCH_HEAD
+Updating 47c05ea..76a9e44
+Fast-forward
+ foo2.txt | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 120000 foo2.txt
+
+C:\joe\backup\repo-bak>git annex get foo2.txt
+get foo2.txt (from origin...)
+SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd78762e80a45f0bbece05f.txt
+
+           7 100%    6.84kB/s    0:00:00 (xfer#1, to-check=0/1)
+
+sent 30 bytes  received 156 bytes  124.00 bytes/sec
+total size is 7  speedup is 0.04
+ok
+warning: LF will be replaced by CRLF in C:\joe\backup\repo-bak\.git\annex\journa
+l\fba_8bb_SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd78762e80a45f0bb
+ece05f.txt.log.
+The file will have its original line endings in your working directory.
+(Recording state in git...)
+
+C:\joe\backup\repo-bak>cat foo2.txt
+.git/annex/objects/3V/kM/SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5ccd
+78762e80a45f0bbece05f.txt/SHA256E-s7--eef0e29200a3194851e5fb4ff77d0d0aec5cd3f5cc
+d78762e80a45f0bbece05f.txt
+C:\joe\backup\repo-bak>
+
+
+
+# End of transcript or log.
+"""]]
diff --git a/doc/forum/Cannot_launch_webapp_on_ubuntu_12.04_using_ppa/comment_7_af6472762a598a454ba52ac0caa059aa._comment b/doc/forum/Cannot_launch_webapp_on_ubuntu_12.04_using_ppa/comment_7_af6472762a598a454ba52ac0caa059aa._comment
new file mode 100644
index 000000000..d205e653d
--- /dev/null
+++ b/doc/forum/Cannot_launch_webapp_on_ubuntu_12.04_using_ppa/comment_7_af6472762a598a454ba52ac0caa059aa._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://openid.fmarier.org/"
+ nickname="fmarier"
+ subject="New location for my PPA"
+ date="2013-06-15T07:41:03Z"
+ content="""
+My Ubuntu Precise PPA has moved here: https://launchpad.net/~fmarier/+archive/git-annex
+
+It contains version 20130601 of git-annex.
+"""]]
diff --git a/doc/forum/Ubuntu_PPA/comment_7_c3f7ec8573934c59d70a48e36e321c13._comment b/doc/forum/Ubuntu_PPA/comment_7_c3f7ec8573934c59d70a48e36e321c13._comment
new file mode 100644
index 000000000..849381ec2
--- /dev/null
+++ b/doc/forum/Ubuntu_PPA/comment_7_c3f7ec8573934c59d70a48e36e321c13._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://openid.fmarier.org/"
+ nickname="fmarier"
+ subject="New location for my git-annex PPA"
+ date="2013-06-15T07:42:13Z"
+ content="""
+My Ubuntu Precise PPA has moved here: https://launchpad.net/~fmarier/+archive/git-annex
+
+It contains version 20130601 of git-annex.
+
+As Pedro suggested, it's now in a separate PPA with only git-annex and the 220 Haskell packages it depends on.
+"""]]
diff --git a/doc/forum/git-annex_teams___47___groups.mdwn b/doc/forum/git-annex_teams___47___groups.mdwn
new file mode 100644
index 000000000..b499f3a6e
--- /dev/null
+++ b/doc/forum/git-annex_teams___47___groups.mdwn
@@ -0,0 +1,5 @@
+Hi,
+
+Does git-annex (preferably assistant) have any management of users / groups or teams? Our use case is we have many users which should only have access to certain folders (repos). Is this a planned feature or any manual way to work around this for now?
+
+Thanks!
diff --git a/doc/install/Ubuntu.mdwn b/doc/install/Ubuntu.mdwn
index 7140a4c26..b6c092527 100644
--- a/doc/install/Ubuntu.mdwn
+++ b/doc/install/Ubuntu.mdwn
@@ -18,12 +18,12 @@ but is otherwise usable.
 
 ## Precise PPA
 
-<https://launchpad.net/~fmarier/+archive/ppa>
+<https://launchpad.net/~fmarier/+archive/git-annex>
 
 A newer version of git-annex, including the [[assistant]] and WebApp.
 (Maintained by François Marier)
 
-	sudo add-apt-repository ppa:fmarier/ppa
+	sudo add-apt-repository ppa:fmarier/git-annex
 	sudo apt-get update
 	sudo apt-get install git-annex
 
diff --git a/doc/install/Ubuntu/comment_3_a08817322739b03cf0fec97283b16f1a._comment b/doc/install/Ubuntu/comment_3_a08817322739b03cf0fec97283b16f1a._comment
new file mode 100644
index 000000000..6d47d49be
--- /dev/null
+++ b/doc/install/Ubuntu/comment_3_a08817322739b03cf0fec97283b16f1a._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://openid.fmarier.org/"
+ nickname="fmarier"
+ subject="New PPA only contains git-annex"
+ date="2013-06-15T07:45:13Z"
+ content="""
+As Pedro suggested, I've moved my git-annex backport to a separate PPA with only git-annex and the 220 Haskell packages it depends on.
+"""]]