log mercurial/merge.py @ 51461:47752632b4fc

age author description
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:20:48 +0200 Raphaël Gomès branching: merge stable into default
Tue, 14 Jun 2022 11:26:18 +0200 Pierre-Yves David purge: prevent a silly crash with --confirm --files stable 6.1.4
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()
Thu, 03 Mar 2022 18:28:30 -0800 Gregory Szorc global: bulk replace simple pycompat.iteritems(x) with x.items()