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

2 files changed, 36 insertions, 0 deletions

diff --git a/doc/bugs/assistant_locked_my_files.mdwn b/doc/bugs/assistant_locked_my_files.mdwn
new file mode 100644
index 000000000..14ac62172
--- /dev/null
+++ b/doc/bugs/assistant_locked_my_files.mdwn
@@ -0,0 +1,28 @@
+### Please describe the problem.
+
+When the assistant is running, using "git annex unlock" on the commandline may lead to unexpected results.
+
+### What steps will reproduce the problem?
+
+Make sure the assitant is running on a repository.
+
+`git annex unlock somefiles`, try to edit them, wait a while, try to edit.
+
+If you're not lucky, the assistant will notice the unlocked files as new and will add them back, locking them in the process, and you won't be able to save them.
+
+### What version of git-annex are you using? On what operating system?
+
+debian wheezy.
+
+[[!format sh """
+git-annex version: 5.20131109-gf2cb5b9
+build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS Feeds Quvi TDFA CryptoHash
+key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
+remote types: git gcrypt S3 bup directory rsync web webdav glacier hook
+local repository version: 3
+default repository version: 3
+supported repository versions: 3 5
+upgrade supported from repository versions: 0 1 2 4
+"""]]
+
+### Please provide any additional information below.
diff --git a/doc/bugs/assistant_locked_my_files/comment_1_74ee7ea12df7bfbb44c9d0485f787b73._comment b/doc/bugs/assistant_locked_my_files/comment_1_74ee7ea12df7bfbb44c9d0485f787b73._comment
new file mode 100644
index 000000000..fdf921c47
--- /dev/null
+++ b/doc/bugs/assistant_locked_my_files/comment_1_74ee7ea12df7bfbb44c9d0485f787b73._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.64"
+ subject="comment 1"
+ date="2013-12-05T20:46:30Z"
+ content="""
+Right -- you can't use the assistant at the same time as git-annex commands that get/drop/unlock files, unless you set the assistant to run in manual mode (which prevents it undoing a get/drop) and/or disable syncing in the assistant entirely (which prevents it adding back unlocked files).
+"""]]