| Fri, 28 Jan 2022 14:25:45 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:25:39 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:25:32 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:25:05 +0100 |
Pierre-Yves David |
merge: break up two not-so-one-liner for extra readability
|
| Fri, 28 Jan 2022 14:24:41 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:24:30 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:23:56 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:23:49 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:23:37 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Tue, 18 Jan 2022 13:23:49 -0800 |
Martin von Zweigbergk |
update: set custom conflict label for base commit
|
| Fri, 10 Dec 2021 17:20:21 +0100 |
Pierre-Yves David |
doc: remove a spurious ^L in some doc
|
| Thu, 02 Dec 2021 22:59:36 -0800 |
Martin von Zweigbergk |
mergestate: merge `preresolve()` into `resolve()`
|
| Fri, 26 Nov 2021 11:53:54 +0100 |
Raphaël Gomès |
typo: s/unkown/unknown across the codebase
|
| Wed, 17 Nov 2021 10:22:15 +0100 |
Pierre-Yves David |
update: filter the ambiguous mtime in update directly
|
| Wed, 17 Nov 2021 02:58:44 +0100 |
Pierre-Yves David |
dirstate: add a comment about a racy piece of code during updates
|
| Fri, 19 Nov 2021 15:39:35 -0800 |
Martin von Zweigbergk |
errors: use detailed exit code when trying to merge file outside narrowspec
|
| Thu, 21 Oct 2021 17:25:41 +0200 |
Raphaël Gomès |
branching: merge stable into default
|
| Mon, 18 Oct 2021 11:23:07 +0200 |
Simon Sapin |
dirstate: store mtimes with nanosecond precision in memory
|
| Tue, 19 Oct 2021 16:14:53 -0700 |
Kyle Lippincott |
merge-halt: fix issue with merge.on-failure=halt breaking unshelve
stable
|
| Thu, 08 Jul 2021 22:08:32 +0200 |
Pierre-Yves David |
sparse: adjust the temporary includes within a `parentchange` context
|
| Tue, 01 Jun 2021 15:19:08 -0700 |
Martin von Zweigbergk |
merge: make applyupdates() not mutate mresult argument
|
| Mon, 29 Mar 2021 01:52:06 +0200 |
Joerg Sonnenberger |
node: replace nullid and friends with nodeconstants class
|
| Thu, 25 Mar 2021 18:02:08 +0100 |
Raphaël Gomès |
contributor: change mentions of mpm to olivia
|
| Wed, 10 Mar 2021 13:14:32 +0530 |
Pulkit Goyal |
commit: get info from mergestate whether a file was merged or not
|
| Thu, 18 Mar 2021 18:24:59 -0400 |
Matt Harbison |
merge with stable
|
| Thu, 11 Mar 2021 18:33:39 -0500 |
Matt Harbison |
merge: force an exception message to bytes before printing as a warning
stable
|
| Fri, 29 Jan 2021 15:56:08 -0800 |
Martin von Zweigbergk |
errors: use StateError more in merge module
|
| Mon, 18 Jan 2021 10:24:11 +0100 |
Pierre-Yves David |
purge: also deal with directory with --confirm
|
| Mon, 18 Jan 2021 10:24:03 +0100 |
Pierre-Yves David |
purge: add a --confirm option
|
| Mon, 18 May 2020 17:29:53 -0400 |
Augie Fackler |
cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))
|
