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
14 lines
880 B
Markdown
14 lines
880 B
Markdown
The user survey is producing some interesting and useful results!
|
|
Added two more polls: [using with](http://git-annex-survey.branchable.com/polls/2013/using_with/) and [blocking problems](http://git-annex-survey.branchable.com/polls/2013/blocking_problems/)
|
|
(There were some load issues so if you were unable to vote yesterday, try
|
|
again..)
|
|
|
|
Worked on getting the autobuilder for OS X Mavericks set up. Eventually
|
|
succeeded, after patching a few packages to work around a cpp that thinks
|
|
it should parse haskell files as if they're C code.
|
|
Also, Jimmy has resuscitated the OS X Lion autobuilder.
|
|
|
|
A not too bad bug in automatic merge conflict resolution has been reported,
|
|
so I will need to dig into that tomorrow. Didn't feel up to it today, so
|
|
instead have been spending the remaining time finishing up a branch that
|
|
switches the test suite to use the tasty test framework.
|