e213ef310f
* Fix minor FD leak in journal code. Closes: #754608 * direct: Fix handling of case where a work tree subdirectory cannot be written to due to permissions. * migrate: Avoid re-checksumming when migrating from hashE to hash backend. * uninit: Avoid failing final removal in some direct mode repositories due to file modes. * S3: Deal with AWS ACL configurations that do not allow creating or checking the location of a bucket, but only reading and writing content to it. * resolvemerge: New plumbing command that runs the automatic merge conflict resolver. * Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. * sync: Fix git sync with local git remotes even when they don't have an annex.uuid set. (The assistant already did so.) * Set gcrypt-publish-participants when setting up a gcrypt repository, to avoid unncessary passphrase prompts. This is a security/usability tradeoff. To avoid exposing the gpg key ids who can decrypt the repository, users can unset gcrypt-publish-participants. * Install nautilus hooks even when ~/.local/share/nautilus/ does not yet exist, since it is not automatically created for Gnome 3 users. * Windows: Move .vbs files out of git\bin, to avoid that being in the PATH, which caused some weird breakage. (Thanks, divB) * Windows: Fix locking issue that prevented the webapp starting (since 5.20140707). # imported from the archive
30 lines
1.1 KiB
Markdown
30 lines
1.1 KiB
Markdown
### 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.
|
|
|
|
[[!tag confirmed]]
|