| Mon, 05 Mar 2018 14:15:31 -0500 |
Gregory Szorc |
merge: use constants for merge driver state
|
| Mon, 05 Mar 2018 14:09:23 -0500 |
Gregory Szorc |
merge: use constants for merge state record types
|
| Mon, 05 Mar 2018 00:02:13 -0500 |
Gregory Szorc |
merge: return an attrs class from update() and applyupdates()
|
| Thu, 22 Mar 2018 22:58:31 -0400 |
Matt Harbison |
merge: add 'isknown=True' to a dirstate.normalize() in _unknowndirschecker
|
| Thu, 22 Mar 2018 22:56:29 -0400 |
Matt Harbison |
merge: pconvert paths in _unknowndirschecker before dirstate-normalizing
|
| Fri, 02 Mar 2018 02:44:49 +0530 |
Pulkit Goyal |
py3: slice over bytes to prevent getting ascii values
|
| Wed, 28 Feb 2018 21:44:28 +0530 |
Pulkit Goyal |
py3: make sure we write in mergestate in bytes mode
|
| Sun, 18 Feb 2018 14:53:55 -0500 |
Augie Fackler |
merge: make a copy of dict.items() before mutating the dict during iteration
|
| Tue, 13 Feb 2018 23:37:58 -0500 |
Augie Fackler |
merge: coerce nodes to bytes, not str
|
| Sun, 11 Feb 2018 13:25:56 -0500 |
Matt Harbison |
merge: invoke scmutil.fileprefetchhooks() prior to applying updates
|
| Sun, 11 Feb 2018 13:09:16 -0800 |
Gregory Szorc |
py3: use bytes() to cast context instances
|
| Tue, 06 Feb 2018 22:55:02 +0900 |
Yuya Nishihara |
merge: cut import cycle at merge -> extensions
|
| Tue, 06 Feb 2018 22:36:38 +0900 |
Yuya Nishihara |
subrepo: split non-core functions to new module
|
| Wed, 17 Jan 2018 17:07:55 +0100 |
Boris Feld |
atomicupdate: add an experimental option to use atomictemp when updating
|
| Wed, 27 Dec 2017 13:53:21 -0600 |
Phil Cohen |
merge: raise before running mergedriver if using IMM
|
| Thu, 07 Dec 2017 13:20:47 -0800 |
Phil Cohen |
merge: don't check for unknown files in IMM
|
| Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
merge: skip subrepo state, update hooks, and updating the dirstate in IMM
|
| Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
merge: remove calls to flushall()
|
| Fri, 24 Nov 2017 12:53:58 -0800 |
Mark Thomas |
merge: check created file dirs for path conflicts only once (issue5716)
stable 4.4.2
|
| Fri, 24 Nov 2017 12:53:58 -0800 |
Mark Thomas |
merge: cache unknown dir checks (issue5716)
stable
|
| Tue, 24 Oct 2017 11:14:38 -0700 |
Siddharth Agarwal |
merge: add a config option to disable path conflict checking
stable
|
| Wed, 04 Oct 2017 23:22:34 +0200 |
muxator |
update: mention long options explicitly in description of merge.update()
stable
|
| Wed, 18 Oct 2017 22:57:15 +0200 |
Gregory Szorc |
fsmonitor: warn when fsmonitor could be used
|
| Sun, 15 Oct 2017 20:36:29 -0700 |
Phil Cohen |
context: add workingfilectx.markcopied
|
| Sun, 15 Oct 2017 20:36:29 -0700 |
Phil Cohen |
merge: don't use workers in in-memory mode
|
| Fri, 06 Oct 2017 06:48:43 -0700 |
Ryan McElroy |
merge: ensure that we always commit the mergestate
|
| Thu, 05 Oct 2017 08:03:57 -0700 |
Mark Thomas |
merge: improve comments in mergestate._makerecords
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: check for path conflicts when merging (issue5628)
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: improve error messages for path conflicts during update
|
| Mon, 02 Oct 2017 14:05:30 -0700 |
Mark Thomas |
merge: check for path conflicts when updating (issue5628)
|
