| Mon, 28 Feb 2022 18:34:23 +0100 |
Raphaël Gomès |
merge: remove direct rustmod reference
stable 6.1
|
file |
diff |
annotate
|
| Tue, 18 Jan 2022 13:22:55 -0800 |
Martin von Zweigbergk |
merge: fix documented order of `labels` argument
|
file |
diff |
annotate
|
| Thu, 03 Feb 2022 18:14:25 +0100 |
Pierre-Yves David |
narrow: add support for merging add and remove outside of the tracked set
|
file |
diff |
annotate
|
| Thu, 03 Feb 2022 18:14:11 +0100 |
Pierre-Yves David |
narrow: allow merging non-conflicting change outside of the narrow spec
|
file |
diff |
annotate
|
| Sat, 29 Jan 2022 06:21:32 +0100 |
Pierre-Yves David |
merge-actions: have an attribute for narrow safetiness
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 15:19:58 +0100 |
Pierre-Yves David |
merge-actions: add an explicite "no_op" attribute
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 17:08:30 +0100 |
Pierre-Yves David |
merge-actions: make merge action a full featured object
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 16:41:45 +0100 |
Pierre-Yves David |
merge: stop using merge action for pathconflict option
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 14:25:51 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 14:25:45 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 14:25:39 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 14:25:32 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 14:25:05 +0100 |
Pierre-Yves David |
merge: break up two not-so-one-liner for extra readability
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 14:24:41 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 14:24:30 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 14:23:56 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 14:23:49 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 14:23:37 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
file |
diff |
annotate
|
| Tue, 18 Jan 2022 13:23:49 -0800 |
Martin von Zweigbergk |
update: set custom conflict label for base commit
|
file |
diff |
annotate
|
| Fri, 10 Dec 2021 17:20:21 +0100 |
Pierre-Yves David |
doc: remove a spurious ^L in some doc
|
file |
diff |
annotate
|
| Thu, 02 Dec 2021 22:59:36 -0800 |
Martin von Zweigbergk |
mergestate: merge `preresolve()` into `resolve()`
|
file |
diff |
annotate
|
| Fri, 26 Nov 2021 11:53:54 +0100 |
Raphaël Gomès |
typo: s/unkown/unknown across the codebase
|
file |
diff |
annotate
|
| Wed, 17 Nov 2021 10:22:15 +0100 |
Pierre-Yves David |
update: filter the ambiguous mtime in update directly
|
file |
diff |
annotate
|
| Wed, 17 Nov 2021 02:58:44 +0100 |
Pierre-Yves David |
dirstate: add a comment about a racy piece of code during updates
|
file |
diff |
annotate
|
| Fri, 19 Nov 2021 15:39:35 -0800 |
Martin von Zweigbergk |
errors: use detailed exit code when trying to merge file outside narrowspec
|
file |
diff |
annotate
|
| Thu, 21 Oct 2021 17:25:41 +0200 |
Raphaël Gomès |
branching: merge stable into default
|
file |
diff |
annotate
|
| Mon, 18 Oct 2021 11:23:07 +0200 |
Simon Sapin |
dirstate: store mtimes with nanosecond precision in memory
|
file |
diff |
annotate
|
| Tue, 19 Oct 2021 16:14:53 -0700 |
Kyle Lippincott |
merge-halt: fix issue with merge.on-failure=halt breaking unshelve
stable
|
file |
diff |
annotate
|
| Thu, 08 Jul 2021 22:08:32 +0200 |
Pierre-Yves David |
sparse: adjust the temporary includes within a `parentchange` context
|
file |
diff |
annotate
|
| Tue, 01 Jun 2021 15:19:08 -0700 |
Martin von Zweigbergk |
merge: make applyupdates() not mutate mresult argument
|
file |
diff |
annotate
|