diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-29 14:03:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-29 14:03:37 -0400 |
| commit | 0ed7db5f3ac87405f56eb27adb9fdaf42bc49125 (patch) | |
| tree | 59eb1401798196a9e82257c1ffae11f4ea29ccea | |
| parent | 61786c52ad128fe39346241ef47e50ac41afb774 (diff) | |
add news item for git-annex 3.20120629
| -rw-r--r-- | doc/design/assistant/syncing.mdwn | 2 | ||||
| -rw-r--r-- | doc/news/version_3.20120605.mdwn | 11 | ||||
| -rw-r--r-- | doc/news/version_3.20120629.mdwn | 12 |
3 files changed, 14 insertions, 11 deletions
diff --git a/doc/design/assistant/syncing.mdwn b/doc/design/assistant/syncing.mdwn index 99474928c..7c6ef16d3 100644 --- a/doc/design/assistant/syncing.mdwn +++ b/doc/design/assistant/syncing.mdwn @@ -46,6 +46,8 @@ reachable remote. This is worth doing first, since it's the simplest way to get the basic functionality of the assistant to work. And we'll need this anyway. +### transfer tracking + data ToTransfer = ToUpload Key | ToDownload Key type ToTransferChan = TChan [ToTransfer] 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 |