Mercurial > hg
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] |