D10087: test-copies: add a test updating file content while merging a pure overwrite

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY As the current test misbehavior show, this confuse various part of the code: - the committed file is different depending of the commit source, - the upgrad

D10088: test-copies: add a test updating file content while salvaging it

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY A deleted file is brought back during a merge. Its content is changed in the same go. This reveal some issue with the upgrade code. REPOSITORY rHG Mercu

D10089: rust: Upgrade Cargo.lock to the newer format

SimonSapin created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY As discussed in https://phab.mercurial-scm.org/D10085#153099 See https://github.com/rust-lang/cargo/pull/7070 and https://blog.rust-lang.org/2020/01/30/

Failed pipeline for branch/default | mercurial-devel | f2b10abd

Pipeline #18676 has failed! Project: mercurial-devel ( https://foss.heptapod.net/octobus/mercurial-devel ) Branch: branch/default ( https://foss.heptapod.net/octobus/mercurial-devel/-/commits/branch/default ) Commit: f2b10abd ( https://foss.heptapod.net/octobus/mercurial-devel/-/commit/f2b10a

Failed pipeline for branch/stable | mercurial-devel | 6803b917

Pipeline #18683 has failed! Project: mercurial-devel ( https://foss.heptapod.net/octobus/mercurial-devel ) Branch: branch/stable ( https://foss.heptapod.net/octobus/mercurial-devel/-/commits/branch/stable ) Commit: 6803b917 ( https://foss.heptapod.net/octobus/mercurial-devel/-/commit/6803b917

D10090: rhg: Make configuration available as early as possible in main()

SimonSapin created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10090 AFFECTED FILES rust/rhg/src/blackbox.rs rust/rhg/src/commands/config.rs

D10092: rhg: Change default `rhg.on-unsupported` configuration to `abort`

SimonSapin created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10092 AFFECTED FILES rust/rhg/src/main.rs tests/test-rhg.t CHANGE DETAILS di

D10093: rhg: Add support for automatic fallback to Python

SimonSapin created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10093 AFFECTED FILES rust/rhg/src/main.rs tests/test-rhg.t CHANGE DETAILS di

D10091: rhg: Add a `rhg.on-unsupported` configuration key

SimonSapin created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY For now the two values are: - `abort-silent`: silently exit with code 252, the previous and now default behavior - `abort`: print an error message about