| 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
|
| Mon, 29 Mar 2021 01:52:06 +0200 |
Joerg Sonnenberger |
node: replace nullid and friends with nodeconstants class
|
file |
diff |
annotate
|
| Thu, 25 Mar 2021 18:02:08 +0100 |
Raphaël Gomès |
contributor: change mentions of mpm to olivia
|
file |
diff |
annotate
|
| Wed, 10 Mar 2021 13:14:32 +0530 |
Pulkit Goyal |
commit: get info from mergestate whether a file was merged or not
|
file |
diff |
annotate
|
| Thu, 18 Mar 2021 18:24:59 -0400 |
Matt Harbison |
merge with stable
|
file |
diff |
annotate
|
| Fri, 29 Jan 2021 15:56:08 -0800 |
Martin von Zweigbergk |
errors: use StateError more in merge module
|
file |
diff |
annotate
|
| Mon, 18 Jan 2021 10:24:11 +0100 |
Pierre-Yves David |
purge: also deal with directory with --confirm
|
file |
diff |
annotate
|
| Mon, 18 Jan 2021 10:24:03 +0100 |
Pierre-Yves David |
purge: add a --confirm option
|
file |
diff |
annotate
|
| Mon, 18 May 2020 17:29:53 -0400 |
Augie Fackler |
cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))
|
file |
diff |
annotate
|
| Thu, 11 Mar 2021 18:33:39 -0500 |
Matt Harbison |
merge: force an exception message to bytes before printing as a warning
stable
|
file |
diff |
annotate
|
| Fri, 27 Nov 2020 17:03:29 -0500 |
Augie Fackler |
formating: upgrade to black 20.8b1
|
file |
diff |
annotate
|
| Fri, 27 Nov 2020 16:59:14 -0500 |
Augie Fackler |
merge: remove spurious ' and trailing whitespace from triple-quoted string
|
file |
diff |
annotate
|
| Mon, 23 Nov 2020 23:08:58 -0800 |
Martin von Zweigbergk |
errors: raise StateError on uncommitted changes when merge starts
|
file |
diff |
annotate
|
| Mon, 22 Jun 2020 22:47:43 -0700 |
Martin von Zweigbergk |
copies: handle more cases where a file got replaced by a copy
|
file |
diff |
annotate
|
| Fri, 09 Oct 2020 09:17:47 -0700 |
Martin von Zweigbergk |
py3: convert an exception message to bytes
|
file |
diff |
annotate
|
| Mon, 14 Sep 2020 23:46:38 +0200 |
Pierre-Yves David |
salvaged: track removal-candidates in more cases
|
file |
diff |
annotate
|
| Fri, 02 Oct 2020 18:40:39 +0530 |
Pulkit Goyal |
merge: check for conflicting actions irrespective of length of bids
|
file |
diff |
annotate
|
| Wed, 30 Sep 2020 18:07:21 +0530 |
Pulkit Goyal |
merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED
|
file |
diff |
annotate
|
| Wed, 30 Sep 2020 15:46:54 +0530 |
Pulkit Goyal |
merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED
|
file |
diff |
annotate
|
| Mon, 24 Aug 2020 15:35:34 +0530 |
Pulkit Goyal |
merge: store cases when a file is absent post merge in commitinfo
|
file |
diff |
annotate
|
| Thu, 03 Sep 2020 13:44:06 +0530 |
Pulkit Goyal |
merge: store commitinfo if these is a dc or cd conflict
|
file |
diff |
annotate
|
| Mon, 14 Sep 2020 14:40:12 +0530 |
Pulkit Goyal |
merge: disable `m2-vs-ma` optimization if new filenode config is true
|
file |
diff |
annotate
|
| Mon, 21 Sep 2020 09:57:29 -0700 |
Martin von Zweigbergk |
merge: add a higher-level update() for the common `hg update` use case
|
file |
diff |
annotate
|
| Mon, 21 Sep 2020 11:12:58 -0700 |
Martin von Zweigbergk |
merge: make low-level update() private (API)
|
file |
diff |
annotate
|
| Mon, 21 Sep 2020 09:56:48 -0700 |
Martin von Zweigbergk |
merge: add a back_out() function to encapsulate update()
|
file |
diff |
annotate
|
| Wed, 16 Sep 2020 18:09:32 +0530 |
Pulkit Goyal |
mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult
|
file |
diff |
annotate
|
| Wed, 09 Sep 2020 16:49:19 +0530 |
Pulkit Goyal |
mergestate: introduce a new ACTION_KEEP_NEW
|
file |
diff |
annotate
|
| Thu, 17 Sep 2020 22:34:36 -0700 |
Martin von Zweigbergk |
mergedriver: delete it
|
file |
diff |
annotate
|
| Tue, 15 Sep 2020 16:10:16 -0700 |
Martin von Zweigbergk |
merge: use in-memory mergestate when using in-memory context
|
file |
diff |
annotate
|
| Thu, 17 Sep 2020 09:23:21 -0700 |
Martin von Zweigbergk |
mergestate: make clean() only be about creating a clean mergestate
|
file |
diff |
annotate
|
| Thu, 03 Sep 2020 13:25:29 +0530 |
Pulkit Goyal |
merge: move initial handling of mergeactions near to later one
|
file |
diff |
annotate
|