| Tue, 15 Feb 2022 20:24:46 -0800 |
Martin von Zweigbergk |
branching: merge with stable
|
| Fri, 11 Feb 2022 16:52:48 -0800 |
Martin von Zweigbergk |
filemerge: put temporary files in single temp dir by default
|
| Tue, 15 Feb 2022 05:20:46 +0100 |
Pierre-Yves David |
dirstate-tracked-key: update the config value to match latest discussion
|
| Fri, 26 Nov 2021 15:38:04 +0100 |
Raphaël Gomès |
rhg: signal when falling back in logs
|
| Mon, 07 Feb 2022 13:23:58 +0100 |
pacien |
revlog: register changelogv2 C implementation in parsers
|
| Mon, 14 Feb 2022 12:34:02 +0100 |
pacien |
revlog: implement changelogv2 packing and unpacking in C
|
| Thu, 10 Feb 2022 16:20:14 +0100 |
pacien |
revlog: memset whole record instead of dealing with padding
|
| Fri, 11 Feb 2022 05:37:19 +0100 |
Pierre-Yves David |
revlog: do not compute node location by hand in index_invalidate_added
|
| Fri, 28 Jan 2022 11:54:44 +0100 |
pacien |
rank: compute property incrementally
|
| Fri, 28 Jan 2022 11:45:33 +0100 |
Pierre-Yves David |
rank: add test with golden values
|
| Fri, 28 Jan 2022 11:45:18 +0100 |
pacien |
rank: add minimal test
|
| Fri, 28 Jan 2022 11:35:41 +0100 |
Pierre-Yves David |
rank: add context and template keyword
|
| Fri, 28 Jan 2022 11:33:01 +0100 |
Pierre-Yves David |
rank: naive rank property computation and retrieval
|
| Mon, 07 Feb 2022 22:54:38 -0800 |
Martin von Zweigbergk |
filemerge: move check for identical sides out of filemerge()
|
| Mon, 07 Feb 2022 20:12:09 -0800 |
Martin von Zweigbergk |
mergestate: use an early return for trivial merges
|
| Mon, 07 Feb 2022 14:07:04 -0800 |
Martin von Zweigbergk |
simplemerge: remove now-unused arguments
|
| Tue, 18 Jan 2022 13:22:55 -0800 |
Martin von Zweigbergk |
merge: fix documented order of `labels` argument
|
| Tue, 18 Jan 2022 12:57:55 -0800 |
Martin von Zweigbergk |
filemerge: when not keeping premerge, don't write markers to context
|
| Fri, 14 Jan 2022 08:17:13 -0800 |
Martin von Zweigbergk |
simplemerge: move printing of merge result to extension
|
| Thu, 10 Feb 2022 15:48:01 -0800 |
Martin von Zweigbergk |
simplemerge: remove code for checking binary input now that callers do it
|
| Thu, 10 Feb 2022 15:27:58 -0800 |
Martin von Zweigbergk |
simplemerge: let filemerge check for binary inputs
|
| Thu, 10 Feb 2022 13:36:09 -0800 |
Martin von Zweigbergk |
simplemerge: let extension check for binary inputs (unless `--text`)
|
| Thu, 10 Feb 2022 11:00:32 -0800 |
Martin von Zweigbergk |
simplemerge: store input data in MergeInput
|
| Fri, 04 Feb 2022 18:36:36 -0800 |
Martin von Zweigbergk |
simplemerge: convert MergeInput to regular, non-attr.ib class
|
| Thu, 10 Feb 2022 09:59:07 -0800 |
Martin von Zweigbergk |
simplemerge: replace `**opts` passed to `simplemerge()` by keyword arguments
|
| Wed, 25 Aug 2021 19:55:20 -0700 |
Gregory Szorc |
automation: use gp3 volume type
stable
|
| Thu, 26 Aug 2021 17:47:50 -0700 |
Gregory Szorc |
automation: use m6i instances
stable
|
| Thu, 03 Feb 2022 18:14:25 +0100 |
Pierre-Yves David |
narrow: add support for merging add and remove outside of the tracked set
|
| Fri, 21 Jan 2022 17:54:03 +0100 |
Simon Sapin |
status: prefer relative paths in Rust code
|
| Mon, 14 Feb 2022 18:51:43 +0100 |
Simon Sapin |
rust: remove unused `StatusError::IO` enum variant
|
