[Bug 6619] New: How to access the Cash app help to tackle tech problems?

https://bz.mercurial-scm.org/show_bug.cgi?id=6619 Bug ID: 6619 Summary: How to access the Cash app help to tackle tech problems? Product: Mercurial Version: default branch Hardware: PC OS: Windows

D11904: simplemerge: rewrite `merge_lines()` using `merge_groups()`

martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Simple is better. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11904 AFFECTED FILES mercurial/simplemerge

D11903: simplemerge: don't calculate conflict labels when resolving automatically

martinvonz 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/D11903 AFFECTED FILES mercurial/simplemerge.py CHANGE DETAILS diff --git a/merc

D11902: simplemerge: remove now-unused `localorother` argument from `merge_lines()`

martinvonz 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/D11902 AFFECTED FILES mercurial/simplemerge.py CHANGE DETAILS diff --git a/merc

D11901: simplemerge: add a specialized function for "union", "local", "other"

martinvonz 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/D11901 AFFECTED FILES mercurial/simplemerge.py CHANGE DETAILS diff --git a/merc

D11899: rhg: Add support for `rhg status --copies`

SimonSapin created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Copy sources are collected during `status()` rather than after the fact like in Python, because `status()` takes a `&mut` exclusive reference to the dirstate

D11900: tests: add a short `sleep` in test-status.t

SimonSapin created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY With dirstate-v2 and rhg both enabled, this test would sometimes fail for me with: --- tests/test-status.t +++ tests/test-status.t#dirstate-v2.err

D11898: rhg: refactor relativize_path into a struct + method

SimonSapin created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY … instead of a function that takes an iterator and a callback. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D

D11897: rhg: refactor display_status_paths with a struct for common arguments

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/D11897 AFFECTED FILES rust/rhg/src/commands/status.rs CHANGE DETAILS diff --git

D11896: doc: remove a spurious ^L in some doc

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This was wrongly introduced in D11784 . REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercu

D11895: test: use `hg debugrequires` instead of `cat` in some tests

marmoute created this revision. Herald added a reviewer: durin42. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This give the "same" result, while taking in account that the requirement file might be in different location, like what `shar

D11894: test: simplify `debugformat` matching in test-phases.t

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will make the test less sensible to unrelated format changing. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.or

D11893: test: simplify `debugformat` matching in test-copies-chain-merge

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This will make the test less sensible to unrelated format changing. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.or

Re: Proposing a new release calendar

Since nobody has objected yet to the new release calendar, I'm leaving this as a "last call" until Friday 17th included (all timezones). Thanks, Raphaël On 11/22/21 11:34, Raphaël Gomès wrote: Hi all, This email is in part prompted by the previous releases' delay, but also by discussions aro

mercurial-devel | Failed pipeline for branch/default | 092e6b6b

Pipeline #30068 has failed! Project: mercurial-devel ( https://foss.heptapod.net/mercurial/mercurial-devel ) Branch: branch/default ( https://foss.heptapod.net/mercurial/mercurial-devel/-/commits/branch/default ) Commit: 092e6b6b ( https://foss.heptapod.net/mercurial/mercurial-devel/-/commit/

mercurial-devel | Failed pipeline for branch/default | 41e9a0a6

Pipeline #30065 has failed! Project: mercurial-devel ( https://foss.heptapod.net/mercurial/mercurial-devel ) Branch: branch/default ( https://foss.heptapod.net/mercurial/mercurial-devel/-/commits/branch/default ) Commit: 41e9a0a6 ( https://foss.heptapod.net/mercurial/mercurial-devel/-/commit/

D11892: share: make it possible to control the working copy format variant

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY A share will use the same format as its source for the store, but there are no reason to not lets it control the working copy variant at creation time. So

D11891: share: move the requirement initialisation code around

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY We will make this logic more flexible in the next patch. We start by moving it at the end of the function without any other change for clarity. REPOSITORY rH

mercurial-devel | Failed pipeline for branch/default | 6c363874

Pipeline #30041 has failed! Project: mercurial-devel ( https://foss.heptapod.net/mercurial/mercurial-devel ) Branch: branch/default ( https://foss.heptapod.net/mercurial/mercurial-devel/-/commits/branch/default ) Commit: 6c363874 ( https://foss.heptapod.net/mercurial/mercurial-devel/-/commit/