This revision was automatically updated to reflect the committed changes.
Closed by commit rHG2a774cae3a03: merge: disable path conflict checking by
default (issue5716) (authored by sid0, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
sid0 updated this revision to Diff 3082.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1223?vs=3076=3082
REVISION DETAIL
https://phab.mercurial-scm.org/D1223
AFFECTED FILES
mercurial/configitems.py
tests/test-audit-path.t
sid0 updated this revision to Diff 3076.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1223?vs=3075=3076
REVISION DETAIL
https://phab.mercurial-scm.org/D1223
AFFECTED FILES
mercurial/configitems.py
tests/test-audit-path.t
sid0 updated this revision to Diff 3075.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1223?vs=3074=3075
REVISION DETAIL
https://phab.mercurial-scm.org/D1223
AFFECTED FILES
mercurial/configitems.py
tests/test-audit-path.t
sid0 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
We shouldn't ship a severe perf regression in hg update for 4.4.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1223
AFFECTED FILES
