Mercurial > public > mercurial-scm > hg-stable

log mercurial/merge.py @ 53040:cdd7bf612c7b stable tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -50 -30 tip
age author description
Tue, 18 Feb 2025 11:48:54 +0100 Rapha?l Gom?s rust: switch `update` module to the `pyo3` implementation
Mon, 17 Feb 2025 16:28:00 +0100 Rapha?l Gom?s importrust: migrate over the last `dirstate` import
Mon, 13 Jan 2025 12:24:33 -0500 Matt Harbison typing: add some type annotations to the `merge.mergeresult` class
Sun, 12 Jan 2025 21:35:30 -0500 Matt Harbison typing: lock in the type annotations that were lost with the pyupgrade changes
Sun, 05 Jan 2025 22:26:16 -0500 Matt Harbison pyupgrade: rewrite `yield` statements in a loop to `yield from`
Tue, 05 Nov 2024 15:21:09 +0100 Rapha?l Gom?s rust-update: make `update_from_null` respect `worker.numcpu` config option stable
Wed, 16 Oct 2024 17:21:03 +0200 Rapha?l Gom?s rust-update: add a config item to disable the Rust update fastpath
Tue, 01 Oct 2024 13:49:11 +0200 Rapha?l Gom?s update: add a Rust fast-path when updating from null (and clean)
Wed, 16 Oct 2024 19:14:30 +0200 Rapha?l Gom?s merge: improve working-copy mtime race handling
Wed, 16 Oct 2024 18:56:19 +0200 Rapha?l Gom?s merge: move the filtering of ambiguous files to a dedicated function
Mon, 16 Sep 2024 15:36:44 +0200 Matt Harbison typing: add `from __future__ import annotations` to most files
Fri, 06 Sep 2024 02:12:19 +0200 Pierre-Yves David brancing: merge stable into default
Tue, 23 Jul 2024 19:20:22 -0400 Matt Harbison typing: induce pytype to use the standard `attr` instead of the vendored copy
Thu, 18 Jul 2024 12:36:12 +0200 Rapha?l Gom?s black: format the codebase with 23.3.0
Tue, 23 Jul 2024 10:02:46 +0200 Rapha?l Gom?s Backout accidental publication of a large range of revisions
Thu, 18 Jul 2024 12:36:12 +0200 Rapha?l Gom?s black: format the codebase with 23.3.0
Wed, 07 Aug 2024 22:05:36 +0200 Manuel Jacob merge: sort filemap only if requested by the caller stable
Thu, 02 Mar 2023 14:44:43 +0100 Pierre-Yves David branch: pass current transaction when writing branch in merge
Wed, 25 Jan 2023 19:12:31 +0100 Pierre-Yves David dirstate: rename parentchange to changing_parents
Wed, 25 Jan 2023 18:46:20 +0100 Pierre-Yves David dirstate: pass the repo to the `changeparent` method
Thu, 12 Jan 2023 13:14:00 +0000 Arseniy Alekseyev merge: add mergeresult.mapaction to improve speed
Wed, 04 Jan 2023 19:30:47 +0000 Arseniy Alekseyev merge: avoid dereferencing repo fields repeatedly
Fri, 06 Jan 2023 18:09:19 +0000 Arseniy Alekseyev merge: skip syntactic path checks in [_checkunknownfile]
Wed, 04 Jan 2023 17:14:33 +0000 Arseniy Alekseyev merge: cache the fs checks made during [_checkunknownfiles]
Wed, 04 Jan 2023 19:13:41 +0000 Arseniy Alekseyev merge: don't pay for pathconflicts if there are none
Fri, 06 Jan 2023 16:01:31 +0000 Arseniy Alekseyev debug: add a config to abort update early
Thu, 16 Jun 2022 15:28:54 +0200 Rapha?l Gom?s branching: merge default into stable stable 6.2rc0
Tue, 31 May 2022 22:50:01 +0200 Manuel Jacob py3: catch FileNotFoundError instead of checking errno == ENOENT
Mon, 21 Feb 2022 13:08:28 -0700 Gregory Szorc py3: use class X: instead of class X(object):
Mon, 21 Feb 2022 11:11:59 -0700 Gregory Szorc merge: remove pycompat.iteritems()
less more | (0) -300 -100 -50 -30 tip