From 8867e7590a3a70afa8a93d2fefab94adc9a176d0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 21 Jul 2025 14:24:22 -0400 Subject: [PATCH] prep for release of 10.20250721 --- CHANGELOG | 16 ++++++++-------- git-annex.cabal | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index deaa942d35..71d01dc7c8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,11 @@ -git-annex (10.20250631) UNRELEASED; urgency=medium +git-annex (10.20250721) UNRELEASED; urgency=medium + * Improved workaround for git 2.50 bug, avoding an occasional test suite + failure, as well as some situations where an unlocked file did not get + populated when adding another file to the repository with the same + content. + * Add --url option and url= preferred content expression, to match + content that is recorded as present in an url. * p2phttp: Scan multilevel directories with --directory. * p2phttp: Added --socket option. * Fix bug in handling of linked worktrees on filesystems not supporting @@ -10,14 +16,8 @@ git-annex (10.20250631) UNRELEASED; urgency=medium that have experienced the above bug. * Fix symlinks generated to annexed content when in adjusted unlocked branch in a linked worktree on a filesystem not supporting symlinks. - * Add --url option and url= preferred content expression, to match - content that is recorded as present in an url. - * Improved workaround for git 2.50 bug, avoding an occasional test suite - failure, as well as some situations where an unlocked file did not get - populated when adding another file to the repository with the same - content. - -- Joey Hess Mon, 07 Jul 2025 15:59:42 -0400 + -- Joey Hess Mon, 21 Jul 2025 14:24:01 -0400 git-annex (10.20250630) upstream; urgency=medium diff --git a/git-annex.cabal b/git-annex.cabal index 8ca109a532..7170559264 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 10.20250630 +Version: 10.20250721 Cabal-Version: 1.12 License: AGPL-3 Maintainer: Joey Hess