This revision was automatically updated to reflect the committed changes.
Closed by commit rHG37450a122128: merge: add a config option to disable path
conflict checking (authored by sid0, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
sid0 added a comment.
> The debug section doesn't seem to exists, could we use 'experimental'
instead while we fix the performance regression?
Good idea! Done, thanks!
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1222
To: sid0, #hg-reviewers
Cc:
sid0 updated this revision to Diff 3081.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1222?vs=3073=3081
REVISION DETAIL
https://phab.mercurial-scm.org/D1222
AFFECTED FILES
mercurial/configitems.py
mercurial/merge.py
CHANGE DETAILS
diff --git
lothiraldan added a comment.
The `debug` section doesn't seem to exists, could we use 'experimental'
instead while we fix the performance regression?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1222
To: sid0, #hg-reviewers
Cc: lothiraldan, mercurial-devel
sid0 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
We've found a severe perf regression in `hg update` caused by the path
conflict
checking code. The next patch will disable this by default.
REPOSITORY
rHG
