add news item for git-annex 3.20120629

2 files changed, 12 insertions, 11 deletions

diff --git a/doc/news/version_3.20120605.mdwn b/doc/news/version_3.20120605.mdwn
deleted file mode 100644
index ed0a09177..000000000
--- a/doc/news/version_3.20120605.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-git-annex 3.20120605 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * sync: Show a nicer message if a user tries to sync to a special remote.
-   * lock: Reset unlocked file to index, rather than to branch head.
-   * import: New subcommand, pulls files from a directory outside the annex
-     and adds them.
-   * Fix display of warning message when encountering a file that uses an
-     unsupported backend.
-   * Require that the SHA256 backend can be used when building, since it's the
-     default.
-   * Preserve parent environment when running hooks of the hook special remote."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20120629.mdwn b/doc/news/version_3.20120629.mdwn
new file mode 100644
index 000000000..e6b98ae99
--- /dev/null
+++ b/doc/news/version_3.20120629.mdwn
@@ -0,0 +1,12 @@
+git-annex 3.20120629 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * cabal: Only try to use inotify on Linux.
+   * Version build dependency on STM, and allow building without it,
+     which disables the watch command.
+   * Avoid ugly failure mode when moving content from a local repository
+     that is not available.
+   * Got rid of the last place that did utf8 decoding.
+   * Accept arbitrarily encoded repository filepaths etc when reading
+     git config output. This fixes support for remotes with unusual characters
+     in their names.
+   * sync: Automatically resolves merge conflicts."""]]
\ No newline at end of file