[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mercurial-devel
Subject:    Re: [PATCH stable] rust: bump to memmap2 0.5.3, micro-timer 0.4.0, and crossbeam-channel 0.5.0
From:       Mads Kiilerich <mads () kiilerich ! com>
Date:       2022-07-29 21:16:08
Message-ID: da82f4a4-59a0-0ebe-f43a-7f614911ef35 () kiilerich ! com
[Download RAW message or body]

Raphaël, could you please have a look at this?

/Mads


On 7/11/22 23:03, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <mads@kiilerich.com>
> # Date 1657572476 -7200
> #      Mon Jul 11 22:47:56 2022 +0200
> # Branch stable
> # Node ID f1713e81437e894fab0658e4f410184e10d35e5e
> # Parent  55adff8105464f6247983940ba109684d36b689d
> rust: bump to memmap2 0.5.3, micro-timer 0.4.0, and crossbeam-channel 0.5.0
>
> The merge in 12adf8c695ed had conflicts in rust/Cargo.lock and
> rust/hg-core/Cargo.toml . Let's ignore rust/Cargo.lock - it is regenerated.
>
> For rust/hg-core/Cargo.toml, stable had dd6b67d5c256 "rust: fix unsound
> `OwningDirstateMap`" which introduced ouroboros (and dropped
> stable_deref_trait).
>
> Default had ec8d9b5a5e7c "rust-hg-core: upgrade dependencies" which had a lot
> of churn bumping minimum versions - also patch versions. It is indeed a good
> idea to bump to *allow* use of latest package. That means that major versions
> should be bumped for packages after 1.0, and for packages below 1.0 minor
> versions should be bumped too. But it doesn't work to try enforce a policy of
> using latest patch by bumping versions at arbitrary times.
>
> For good or bad, the merge doesn't seem to have resolved the conflicts
> correctly, and many of the minor "upgrade dependencies" were lost again.
>
> Unfortunately, it also lost the bump of memmap2 to 0.5.3, which is needed for
> Fedora packaging where 0.4 isn't available. Same with micro-timer bump to 0.4
> (which already is used in rhg). crossbeam-channel bump was also lost.
>
> This change fixes that regression by redoing these "important" lines of the
> merge "correctly".
>
> I propose this for stable, even though dependency changes on stable branches
> are annoying.
>
> 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
> @@ -29,10 +29,10 @@ sha-1 = "0.10.0"
>   twox-hash = "1.6.2"
>   same-file = "1.0.6"
>   tempfile = "3.1.0"
> -crossbeam-channel = "0.4"
> -micro-timer = "0.3.0"
> +crossbeam-channel = "0.5.0"
> +micro-timer = "0.4.0"
>   log = "0.4.8"
> -memmap2 = {version = "0.4", features = ["stable_deref_trait"]}
> +memmap2 = { version = "0.5.3", features = ["stable_deref_trait"] }
>   zstd = "0.5.3"
>   format-bytes = "0.3.0"
>   
>

_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@lists.mercurial-scm.org
https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel

[prev in list] [next in list] [prev in thread] [next in thread]