add news item for git-annex 6.20171026

2 files changed, 14 insertions, 32 deletions

diff --git a/doc/news/version_6.20170520.mdwn b/doc/news/version_6.20170520.mdwn
deleted file mode 100644
index 2eca934ec..000000000
--- a/doc/news/version_6.20170520.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-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
diff --git a/doc/news/version_6.20171026.mdwn b/doc/news/version_6.20171026.mdwn
new file mode 100644
index 000000000..83f3d993e
--- /dev/null
+++ b/doc/news/version_6.20171026.mdwn
@@ -0,0 +1,14 @@
+git-annex 6.20171026 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Windows: Fix reversion that caused the path used to link
+     to annexed content to include the drive letter and full path, rather
+     than being relative. (`git annex fix` will fix up after this problem).
+   * Windows build fixed, and changed to use stack for more reliable build
+     environment.
+   * Windows: Remove wget from bundle; it needs libraries that are not
+     included, and git for windows includes curl which git-annex will use
+     instead.
+   * Add day to metadata when annex.genmetadata is enabled.
+     Thanks, Sean T Parsons
+   * stack.yaml: Added nix packages section.
+     Thanks, Sean T Parsons"""]]
\ No newline at end of file