From 26137ef9fb4dfd1276d076c4eab8d3eb876e458d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 12 Jun 2017 13:55:27 -0400 Subject: [PATCH] add news item for git-annex 6.20170520 --- doc/news/version_6.20170301.mdwn | 4 ---- doc/news/version_6.20170520.mdwn | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) delete mode 100644 doc/news/version_6.20170301.mdwn create mode 100644 doc/news/version_6.20170520.mdwn diff --git a/doc/news/version_6.20170301.mdwn b/doc/news/version_6.20170301.mdwn deleted file mode 100644 index 0679e251d7..0000000000 --- a/doc/news/version_6.20170301.mdwn +++ /dev/null @@ -1,4 +0,0 @@ -git-annex 6.20170301 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * No changes from 6.20170228; a new version number was needed due - to a problem with Hackage."""]] \ No newline at end of file diff --git a/doc/news/version_6.20170520.mdwn b/doc/news/version_6.20170520.mdwn new file mode 100644 index 0000000000..2eca934ec3 --- /dev/null +++ b/doc/news/version_6.20170520.mdwn @@ -0,0 +1,32 @@ +git-annex 6.20170520 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * move --to=here moves from all reachable remotes to the local repository. + * initremote, enableremote: Support gpg subkeys suffixed with an + exclamation mark, which forces gpg to use a specific subkey. + * Improve progress display when watching file size, in cases where + a transfer does not resume. + * Fix transfer log file locking problem when running concurrent + transfers. + * Avoid concurrent git-config setting problem when running concurrent + threads. + * metadata: When setting metadata of a file that did not exist, + no error message was displayed, unlike getting metadata and most other + git-annex commands. Fixed this oversight. + * Added annex.resolvemerge configuration, which can be set to false to + disable the usual automatic merge conflict resolution done by git-annex + sync and the assistant. + * sync: Added --no-resolvemerge option. + * Avoid error about git-annex-shell not being found when + syncing with -J with a git remote where git-annex-shell is not + installed. + * Fix bug that prevented transfer locks from working when + run on SMB or other filesystem that does not support fcntl locks + and hard links. + * assistant: Merge changes from refs/remotes/foo/master into master. + Previously, only sync branches were merged. This makes regular git push + into a repository watched by the assistant auto-merge. + * Makefile: Install completions for the fish and zsh shells + when git-annex is built with optparse-applicative-0.14. + * assistant: Don't trust OSX FSEvents's eventFlagItemModified to be called + when the last writer of a file closes it; apparently that sometimes + does not happen, which prevented files from being quickly added."""]] \ No newline at end of file