releasing package git-annex version 10.20250630

diff --git a/CHANGELOG b/CHANGELOG
index 8af3c1889a9b1017a20440b4aad10ed18abc5727..a0e380ace92ce213cfdde7a4c9dc2d330bf2531b 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,15 +1,15 @@
-git-annex (10.20250606) UNRELEASED; urgency=medium
+git-annex (10.20250630) upstream; urgency=medium
 
+  * Work around git 2.50 bug that caused it to crash when there is a merge
+    conflict with an unlocked annexed file.
   * Skip and warn when a tree import includes empty filenames,
     which can happen with eg a S3 bucket.
   * Avoid a problem with temp file names ending in whitespace on
     filesystems like VFAT that don't support such filenames.
   * webapp: Rename "Upgrade Repository" to "Convert Repository"
     to avoid confusion with git-annex upgrade.
-  * Work around git 2.50 bug that caused it to crash when there is a merge
-    conflict with an unlocked annexed file.
 
- -- Joey Hess <id@joeyh.name>  Mon, 23 Jun 2025 11:11:29 -0400
+ -- Joey Hess <id@joeyh.name>  Mon, 30 Jun 2025 10:05:18 -0400
 
 git-annex (10.20250605) upstream; urgency=medium
 

diff --git a/git-annex.cabal b/git-annex.cabal
index 8c5933d8983647b5c456b5b3cdd9c05f530f7640..8ca109a53207b53936291df241d58900ea0cd16b 100644 (file)
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
 Name: git-annex
-Version: 10.20250605
+Version: 10.20250630
 Cabal-Version: 1.12
 License: AGPL-3
 Maintainer: Joey Hess <id@joeyh.name>