From c6b6be2eab17fd5d8921f3af9376d15f2cf917f5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Jun 2025 10:05:44 -0400 Subject: [PATCH] releasing package git-annex version 10.20250630 --- CHANGELOG | 8 ++++---- git-annex.cabal | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8af3c1889a..a0e380ace9 100644 --- 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 Mon, 23 Jun 2025 11:11:29 -0400 + -- Joey Hess 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 8c5933d898..8ca109a532 100644 --- 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