diff --git a/.gitignore b/.gitignore index 79e8e0c..f002d7a 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ mercurial-1.6.2.tar.gz /mercurial-6.2.2.tar.gz /mercurial-6.2.3.tar.gz /mercurial-6.3.0.tar.gz +/mercurial-6.3.1.tar.gz diff --git a/mercurial-rust-metadata.patch b/mercurial-rust-metadata.patch index aff7beb..c7127ed 100644 --- a/mercurial-rust-metadata.patch +++ b/mercurial-rust-metadata.patch @@ -6,7 +6,7 @@ Update zstd to 0.11.0 (upstream is stuck on 0.5 because MSRV) diff --git a/rust/hg-core/Cargo.toml b/rust/hg-core/Cargo.toml --- a/rust/hg-core/Cargo.toml +++ b/rust/hg-core/Cargo.toml -@@ -34,11 +34,11 @@ +@@ -34,7 +34,7 @@ micro-timer = "0.4.0" log = "0.4.8" memmap2 = { version = "0.5.3", features = ["stable_deref_trait"] } @@ -15,11 +15,6 @@ diff --git a/rust/hg-core/Cargo.toml b/rust/hg-core/Cargo.toml format-bytes = "0.3.0" # once_cell 1.15 uses edition 2021, while the heptapod CI # uses an old version of Cargo that doesn't support it. --once_cell = "=1.14.0" -+once_cell = "1.14.0" - - # We don't use the `miniz-oxide` backend to not change rhg benchmarks and until - # we have a clearer view of which backend is the fastest. diff --git a/rust/hg-core/src/revlog/revlog.rs b/rust/hg-core/src/revlog/revlog.rs --- a/rust/hg-core/src/revlog/revlog.rs +++ b/rust/hg-core/src/revlog/revlog.rs diff --git a/mercurial.spec b/mercurial.spec index eef15b4..776ee5f 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -9,7 +9,7 @@ Summary: A fast, lightweight Source Control Management system Name: mercurial -Version: 6.3.0 +Version: 6.3.1 Release: 1%{?dist} # Release: 1.rc1%%{?dist} @@ -273,6 +273,9 @@ pathfix.py -pni "%{python3}" %{buildroot}%{_bindir}/hg-ssh %changelog +* Sat Nov 19 2022 Mads Kiilerich - 6.3.1-1 +- mercurial 6.3.1 + * Mon Nov 14 2022 Mads Kiilerich - 6.3.0-1 - mercurial 6.3.0 diff --git a/sources b/sources index 8ee8f4a..427c1b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mercurial-6.3.0.tar.gz) = 17242605f19b49cb962a0f2dbe1cbec01ec25fb4336b055cf7a9d7663c711e9adac29430c594a4f108e03ad11bee5965f82f8081def397d3ac953b86aa16378c +SHA512 (mercurial-6.3.1.tar.gz) = 99cd77c25e6c7f064ea9b631a8632b6020cb012c2f5a8c1da371ed413a4f984d04f8c293f551f890bbf084f840d7406aa25956f016ff2596173cd2f1f834873b