| Thu, 20 Jan 2022 14:06:36 +0000 |
Arseniy Alekseyev |
revlog: fix a bug where transaction can be aborted partially
stable
|
| Thu, 20 Jan 2022 14:02:58 +0000 |
Arseniy Alekseyev |
revlog: demonstrate a bug where transaction can be aborted partially
stable
|
| Tue, 18 Jan 2022 10:27:13 +0100 |
Raphaël Gomès |
branching: merge with stable
|
| Thu, 30 Dec 2021 13:25:44 +0100 |
Dan Villiom Podlaski Christiansen |
rust: fix build errors on darwin
stable
|
| Mon, 17 Jan 2022 12:50:13 +0100 |
Simon Sapin |
rust: Fix outdated comments in OwningDirstateMap
|
| Fri, 14 Jan 2022 09:28:44 -0800 |
Martin von Zweigbergk |
merge: consider the file merged when using :merge-{local,other}
|
| Fri, 14 Jan 2022 08:44:36 -0800 |
Martin von Zweigbergk |
simplemerge: delete unused exception class `CantReprocessAndShowBase`
|
| Tue, 11 Jan 2022 22:13:56 -0800 |
Martin von Zweigbergk |
simplemerge: change _minimize() to minimize a single conflict
|
| Tue, 11 Jan 2022 22:03:55 -0800 |
Martin von Zweigbergk |
simplemerge: make minimize() a free function
|
| Tue, 11 Jan 2022 21:56:27 -0800 |
Martin von Zweigbergk |
simplemerge: simplify and rename `render_markers()`
|
| Tue, 11 Jan 2022 16:23:10 -0800 |
Martin von Zweigbergk |
simplemerge: split out function for rendering :merge3 conflict markers
|
| Fri, 07 Jan 2022 23:29:19 -0800 |
Martin von Zweigbergk |
simplemerge: move default labels to simplemerge extension
|
| Fri, 07 Jan 2022 22:23:44 -0800 |
Martin von Zweigbergk |
simplemerge: use same newline detection for :mergediff as for :merge[3]
|
| Tue, 11 Jan 2022 16:54:42 -0800 |
Martin von Zweigbergk |
simplemerge: clarify names of functions that render conflict markers
|
| Fri, 07 Jan 2022 22:16:22 -0800 |
Martin von Zweigbergk |
simplemerge: make merge_lines() a free function
|
| Fri, 07 Jan 2022 18:42:31 -0800 |
Martin von Zweigbergk |
simplemerge: convert `merge_lines()` away from generator
|
| Tue, 14 Dec 2021 13:12:56 -0800 |
Martin von Zweigbergk |
simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels
|
| Fri, 14 Jan 2022 10:25:45 -0800 |
Martin von Zweigbergk |
rust: upgrade `rand*` crates
|
| Thu, 06 Jan 2022 22:09:40 -0800 |
Martin von Zweigbergk |
logcmdutil: raise `StateError` when file to follow doesn't exist
|
| Thu, 06 Jan 2022 22:03:21 -0800 |
Martin von Zweigbergk |
logcmdutil: raise `InputError` on bad CLI arguments
|
| Mon, 10 Jan 2022 18:04:41 -0500 |
Matt Harbison |
subrepo: make -S work again on Windows for incoming/outgoing to remote repos
stable
|
| Sun, 09 Jan 2022 13:35:30 +0100 |
Cédric Krier |
tests: support pygments 2.11 (issue6628)
|
| Mon, 03 Jan 2022 01:09:56 +0100 |
Joerg Sonnenberger |
exchange: add fast path for subrepo check on push
|
| Wed, 05 Jan 2022 11:34:54 -0800 |
Martin von Zweigbergk |
simplemerge: rewrite `merge_lines()` using `merge_groups()`
|
