From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 4 Jul 2024 20:46:33 +0000 (+0100)
Subject: Merge version 6.7.3-1+rpi1 and 6.7.4-1 to produce 6.7.4-1+rpi1
X-Git-Tag: archive/raspbian/6.7.4-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=04312ff36bd1453e8618301a0e126f5981d79d55;p=mercurial.git

Merge version 6.7.3-1+rpi1 and 6.7.4-1 to produce 6.7.4-1+rpi1
---

6c7008d4ee820068dc11071e294154008447e370
diff --cc debian/changelog
index c64d0c2,f4056fc..1ad80fd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- mercurial (6.7.3-1+rpi1) trixie-staging; urgency=medium
++mercurial (6.7.4-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 6.1.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 21 Apr 2022 22:42:37 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 01 Jun 2024 07:06:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 04 Jul 2024 20:46:33 +0000
++
+ mercurial (6.7.4-1) unstable; urgency=high
+ 
+   * New upstream bugfix release.  Fixes critical regression in 6.7.x
+     causing possible data loss.
+ 
+  -- Julien Cristau <jcristau@debian.org>  Wed, 12 Jun 2024 12:11:15 +0200
  
  mercurial (6.7.3-1) unstable; urgency=medium