From a0a873d44c1bef2005db15b446268587aff2d770 Mon Sep 17 00:00:00 2001 From: "nivek-retsof@97a405d1563af7581f6c8d1f7bae67b0ce896721" Date: Tue, 5 Nov 2019 22:18:49 +0000 Subject: [PATCH 1/3] Added a comment: Thanks! --- ...omment_2_209826312977675475affe8f669dfa73._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/news/version_7.20191024/comment_2_209826312977675475affe8f669dfa73._comment diff --git a/doc/news/version_7.20191024/comment_2_209826312977675475affe8f669dfa73._comment b/doc/news/version_7.20191024/comment_2_209826312977675475affe8f669dfa73._comment new file mode 100644 index 0000000000..1cdeae256d --- /dev/null +++ b/doc/news/version_7.20191024/comment_2_209826312977675475affe8f669dfa73._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="nivek-retsof@97a405d1563af7581f6c8d1f7bae67b0ce896721" + nickname="nivek-retsof" + avatar="http://cdn.libravatar.org/avatar/3aec9a88897e105952a4ed38007fb224" + subject="Thanks!" + date="2019-11-05T22:18:49Z" + content=""" +This behavior makes more sense to me. I like keeping my text files in git and binaries in git-annex, and treating them separately is no great mental burden. + +Thanks for your great work. Git-annex has become one of the best parts of my computing experience. It is a great relief knowing that my files are in a robust distributed and redundant collection that is easy to maintain. +"""]] From 73e928fcfb23272b279f9b4cab45e95574da4b6a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 6 Nov 2019 12:21:02 -0400 Subject: [PATCH 2/3] prep release --- CHANGELOG | 4 ++-- git-annex.cabal | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 344e2ff299..da88c214f5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,10 +1,10 @@ -git-annex (7.20191025) UNRELEASED; urgency=medium +git-annex (7.20191106) upstream; urgency=medium * init: Fix bug that lost modifications to unlocked files when init is re-ran in an already initialized repo. * benchmark: Add --databases to benchmark sqlite databases. - -- Joey Hess Tue, 29 Oct 2019 15:13:03 -0400 + -- Joey Hess Wed, 06 Nov 2019 12:14:50 -0400 git-annex (7.20191024) upstream; urgency=medium diff --git a/git-annex.cabal b/git-annex.cabal index 1f18d6dca1..98a061b573 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 7.20191024 +Version: 7.20191106 Cabal-Version: >= 1.8 License: AGPL-3 Maintainer: Joey Hess From 6f8b745e230effdcd078e3099ee19f3a9f02623a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 6 Nov 2019 18:37:42 -0400 Subject: [PATCH 3/3] add news item for git-annex 7.20191106 --- doc/news/version_7.20190912.mdwn | 62 -------------------------------- doc/news/version_7.20191106.mdwn | 5 +++ 2 files changed, 5 insertions(+), 62 deletions(-) delete mode 100644 doc/news/version_7.20190912.mdwn create mode 100644 doc/news/version_7.20191106.mdwn diff --git a/doc/news/version_7.20190912.mdwn b/doc/news/version_7.20190912.mdwn deleted file mode 100644 index 5e2beb26fa..0000000000 --- a/doc/news/version_7.20190912.mdwn +++ /dev/null @@ -1,62 +0,0 @@ -News for git-annex 7.20190912: - -This version of git-annex uses repository version 7 for all repositories. -Existing v5 repositories will be automatically upgraded by default. - -You can prevent this, by runing: git config annex.autoupgraderepository false - -A v7 repository can can have some files locked while other files are -unlocked, and all git and git-annex commands can be used on both locked and -unlocked files. It's a good idea to make sure that all users of the -repository have upgraded git-annex and upgraded their repositories -to the new version before starting to use that feature, since old -versions of git-annex will ignore the new unlocked files. - -The behavior of some commands changes in an upgraded repository: - -* `git add` will add files to the annex, rather than adding them directly - to the git repository. To cause some files to be added directly - to git, you can configure `annex.largefiles`. For example: - git config annex.largefiles "largerthan=100kb and not (include=*.c or include=*.h)" - -* `git annex unlock` and `git annex lock` change how the pointer to - the annexed content is stored in git. If you commit the change, - that will impact all clones of the repository. - -git-annex 7.20190912 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Default to v7 for new repositories. - * Automatically upgrade v5 repositories to v7. - * Automatically convert direct mode repositories to v7 with adjusted - unlocked branches and set annex.thin. - * Added annex.autoupgraderepository configuration that can be set to false - to prevent any automatic repository upgrades. - * Refuse to upgrade direct mode repositories when git is older than 2.22, - which fixed a memory leak that could cause an OOM during the upgrade. - * Removed support for git versions older than 2.1. - * assistant: When creating a new repository, no longer use direct - mode, instead use v7 adjusted branches with annex.thin. - * init: When run on a crippled filesystem with --version=5, - will error out, since version 7 is needed for adjusted unlocked branch. - * direct: This command always errors out as direct mode is no longer - supported. - * indirect: This command has become a deprecated noop. - * proxy: This command is deprecated because it was only needed in direct - mode. (But it continues to work.) - * info: Removed the "repository mode" from its output (including the - --json output) since with the removal of direct mode, there is no - repository mode. - * info: When file matching options are specified when getting - info of something other than a directory, they won't have any effect, - so error out to avoid confusion. - * info: Display trust level when getting info on a uuid, same as a remote. - * When upgrading a direct mode repo to v7 with adjusted unlocked branches, - fix a bug that prevented annex.thin from taking effect for the files - in working tree. - * Avoid making a commit when upgrading from direct mode to v7. - * init: Catch more exceptions when testing locking. - * init: Fix a reversion that broke initialization on systems that - need to use pid locking. - * A git-annex-standalone rpm is now distributed along with the standalone - tarball. - * Added standalone/rpm/rpmbuild-from-standalone-tarball script."""]] diff --git a/doc/news/version_7.20191106.mdwn b/doc/news/version_7.20191106.mdwn new file mode 100644 index 0000000000..e51c99a3dc --- /dev/null +++ b/doc/news/version_7.20191106.mdwn @@ -0,0 +1,5 @@ +git-annex 7.20191106 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * init: Fix bug that lost modifications to unlocked files when init is + re-ran in an already initialized repo. + * benchmark: Add --databases to benchmark sqlite databases."""]] \ No newline at end of file