From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 5 Feb 2021 14:29:15 +0000 (+0000)
Subject: Merge version 5.6.1-1+rpi1 and 5.6.1-2 to produce 5.6.1-2+rpi1
X-Git-Tag: archive/raspbian/5.6.1-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f760ead29843df55319f0a591ce2f4edd0d54eb7;p=mercurial.git

Merge version 5.6.1-1+rpi1 and 5.6.1-2 to produce 5.6.1-2+rpi1
---

f760ead29843df55319f0a591ce2f4edd0d54eb7
diff --cc debian/changelog
index 822a53e,1664f53..80a3c99
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- mercurial (5.6.1-1+rpi1) bullseye-staging; urgency=medium
++mercurial (5.6.1-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 5.5.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 13 Dec 2020 10:30:51 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 23 Jan 2021 13:59:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Feb 2021 14:29:15 +0000
++
+ mercurial (5.6.1-2) unstable; urgency=medium
+ 
+   * tests: make test-subrepo-git.t compatible with git's master->main
+     rename (closes: #980576).
+ 
+  -- Julien Cristau <jcristau@debian.org>  Mon, 01 Feb 2021 17:47:09 +0100
  
  mercurial (5.6.1-1) unstable; urgency=medium