| Thu, 27 Jun 2019 11:39:35 +0200 |
Valentin Gatien-Baron |
update: fix spurious unclean status bug shown by previous commit
|
file |
diff |
annotate
|
| Mon, 27 May 2019 16:55:46 -0400 |
Valentin Gatien-Baron |
merge: fix race that could cause wrong size in dirstate
|
file |
diff |
annotate
|
| Tue, 04 Jun 2019 17:24:35 +0800 |
Anton Shestakov |
merge: correct argument name in docstring
|
file |
diff |
annotate
|
| Sat, 09 Mar 2019 22:13:06 -0800 |
Martin von Zweigbergk |
merge: simplify initialization of "pas"
|
file |
diff |
annotate
|
| Sat, 09 Mar 2019 22:11:27 -0800 |
Martin von Zweigbergk |
merge: reorder some initialization to make more sense
|
file |
diff |
annotate
|
| Sun, 14 Apr 2019 00:46:25 -0700 |
Martin von Zweigbergk |
merge: remove workaround for issue5020
|
file |
diff |
annotate
|
| Fri, 12 Apr 2019 09:41:08 -0700 |
Martin von Zweigbergk |
copies: print list of divergent renames in sorted order
|
file |
diff |
annotate
|
| Wed, 03 Apr 2019 11:21:27 -0700 |
Martin von Zweigbergk |
cleanup: use set literals where possible
|
file |
diff |
annotate
|
| Sat, 30 Mar 2019 13:13:10 -0700 |
Martin von Zweigbergk |
merge: make "labels" argument to graft() optional, like it is for update()
|
file |
diff |
annotate
|
| Wed, 20 Feb 2019 19:28:51 -0500 |
Augie Fackler |
cleanup: use () to wrap long lines instead of \
|
file |
diff |
annotate
|
| Mon, 04 Feb 2019 21:19:05 -0800 |
Martin von Zweigbergk |
merge: migrate to scmutil.backuppath()
|
file |
diff |
annotate
|
| Mon, 04 Feb 2019 21:23:44 -0800 |
Martin von Zweigbergk |
merge: don't unnecessarily calculate absolute path
|
file |
diff |
annotate
|
| Mon, 04 Feb 2019 21:21:55 -0800 |
Martin von Zweigbergk |
merge: don't unnecessarily calculate backup path
|
file |
diff |
annotate
|
| Thu, 17 Jan 2019 09:17:12 -0800 |
Martin von Zweigbergk |
cleanup: delete lots of unused local variables
|
file |
diff |
annotate
|
| Tue, 08 Jan 2019 14:19:51 -0800 |
Daniel Ploch |
merge: make local file storage in the .hg/merge directory extensible
|
file |
diff |
annotate
|
| Sun, 23 Dec 2018 13:16:25 +0530 |
Sushil khanchi |
merge: modify the logical statement
|
file |
diff |
annotate
|
| Fri, 21 Dec 2018 09:48:30 -0800 |
Martin von Zweigbergk |
merge: extract helper for creating empty "actions" dict
|
file |
diff |
annotate
|
| Fri, 21 Sep 2018 19:48:23 -0400 |
Matt Harbison |
py3: rename pycompat.getcwd() to encoding.getcwd() (API)
|
file |
diff |
annotate
|
| Tue, 04 Sep 2018 15:55:23 -0700 |
Gregory Szorc |
merge: use vfs methods for I/O
|
file |
diff |
annotate
|
| Thu, 06 Sep 2018 18:30:12 -0700 |
Gregory Szorc |
merge: move purge logic from extension
|
file |
diff |
annotate
|
| Fri, 27 Jul 2018 14:56:10 +0300 |
Pulkit Goyal |
merge: do the trivial resolution after updating sparse checkout
stable
|
file |
diff |
annotate
|
| Wed, 18 Jul 2018 09:49:34 -0700 |
Gregory Szorc |
merge: mark file gets as not thread safe (issue5933)
|
file |
diff |
annotate
|
| Tue, 29 May 2018 00:26:20 +0200 |
Boris Feld |
merge: add a 'keepconflictparent' argument to graft
|
file |
diff |
annotate
|
| Thu, 21 Jun 2018 09:32:31 -0700 |
Martin von Zweigbergk |
merge with stable
|
file |
diff |
annotate
|
| Sun, 17 Jun 2018 22:13:41 -0700 |
Martin von Zweigbergk |
progress: hide update(None) in a new complete() method
|
file |
diff |
annotate
|
| Fri, 15 Jun 2018 22:37:01 -0700 |
Martin von Zweigbergk |
progress: create helper class for incrementing progress
|
file |
diff |
annotate
|
| Thu, 17 May 2018 15:25:52 -0700 |
Martin von Zweigbergk |
narrow: filter set of files to check for case-folding to core
|
file |
diff |
annotate
|
| Thu, 17 May 2018 15:12:48 -0700 |
Martin von Zweigbergk |
narrow: filter merge actions in core
|
file |
diff |
annotate
|
| Fri, 11 May 2018 00:54:37 -0400 |
Augie Fackler |
merge: drop support for using updateresults as tuples (API)
|
file |
diff |
annotate
|
| Tue, 19 Jun 2018 22:45:52 +0900 |
Yuya Nishihara |
merge: do not fill manifest of committed revision with pseudo node (issue5526)
stable
|
file |
diff |
annotate
|
| Sat, 14 Apr 2018 18:50:45 -0400 |
Matt Harbison |
scmutil: teach the file prefetch hook to handle multiple commits
|
file |
diff |
annotate
|
| Thu, 29 Mar 2018 21:29:15 -0700 |
Martin von Zweigbergk |
context: avoid using a context object as a changeid
|
file |
diff |
annotate
|
| Mon, 05 Mar 2018 00:30:00 -0500 |
Gregory Szorc |
merge: deprecate accessing update results by index
|
file |
diff |
annotate
|
| Mon, 05 Mar 2018 18:10:36 -0800 |
Gregory Szorc |
merge: use constants for actions
|
file |
diff |
annotate
|
| Mon, 05 Mar 2018 14:21:57 -0500 |
Gregory Szorc |
merge: use constants for merge record state
|
file |
diff |
annotate
|
| Mon, 05 Mar 2018 14:15:31 -0500 |
Gregory Szorc |
merge: use constants for merge driver state
|
file |
diff |
annotate
|
| Mon, 05 Mar 2018 14:09:23 -0500 |
Gregory Szorc |
merge: use constants for merge state record types
|
file |
diff |
annotate
|
| Mon, 05 Mar 2018 00:02:13 -0500 |
Gregory Szorc |
merge: return an attrs class from update() and applyupdates()
|
file |
diff |
annotate
|
| Thu, 22 Mar 2018 22:58:31 -0400 |
Matt Harbison |
merge: add 'isknown=True' to a dirstate.normalize() in _unknowndirschecker
|
file |
diff |
annotate
|
| Thu, 22 Mar 2018 22:56:29 -0400 |
Matt Harbison |
merge: pconvert paths in _unknowndirschecker before dirstate-normalizing
|
file |
diff |
annotate
|
| Fri, 02 Mar 2018 02:44:49 +0530 |
Pulkit Goyal |
py3: slice over bytes to prevent getting ascii values
|
file |
diff |
annotate
|
| Wed, 28 Feb 2018 21:44:28 +0530 |
Pulkit Goyal |
py3: make sure we write in mergestate in bytes mode
|
file |
diff |
annotate
|
| Sun, 18 Feb 2018 14:53:55 -0500 |
Augie Fackler |
merge: make a copy of dict.items() before mutating the dict during iteration
|
file |
diff |
annotate
|
| Tue, 13 Feb 2018 23:37:58 -0500 |
Augie Fackler |
merge: coerce nodes to bytes, not str
|
file |
diff |
annotate
|
| Sun, 11 Feb 2018 13:25:56 -0500 |
Matt Harbison |
merge: invoke scmutil.fileprefetchhooks() prior to applying updates
|
file |
diff |
annotate
|
| Sun, 11 Feb 2018 13:09:16 -0800 |
Gregory Szorc |
py3: use bytes() to cast context instances
|
file |
diff |
annotate
|
| Tue, 06 Feb 2018 22:55:02 +0900 |
Yuya Nishihara |
merge: cut import cycle at merge -> extensions
|
file |
diff |
annotate
|
| Tue, 06 Feb 2018 22:36:38 +0900 |
Yuya Nishihara |
subrepo: split non-core functions to new module
|
file |
diff |
annotate
|
| Wed, 17 Jan 2018 17:07:55 +0100 |
Boris Feld |
atomicupdate: add an experimental option to use atomictemp when updating
|
file |
diff |
annotate
|
| Wed, 27 Dec 2017 13:53:21 -0600 |
Phil Cohen |
merge: raise before running mergedriver if using IMM
|
file |
diff |
annotate
|
| Thu, 07 Dec 2017 13:20:47 -0800 |
Phil Cohen |
merge: don't check for unknown files in IMM
|
file |
diff |
annotate
|
| Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
merge: skip subrepo state, update hooks, and updating the dirstate in IMM
|
file |
diff |
annotate
|
| Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
merge: remove calls to flushall()
|
file |
diff |
annotate
|
| 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
|
file |
diff |
annotate
|
| Fri, 24 Nov 2017 12:53:58 -0800 |
Mark Thomas |
merge: cache unknown dir checks (issue5716)
stable
|
file |
diff |
annotate
|
| Tue, 24 Oct 2017 11:14:38 -0700 |
Siddharth Agarwal |
merge: add a config option to disable path conflict checking
stable
|
file |
diff |
annotate
|
| Wed, 04 Oct 2017 23:22:34 +0200 |
muxator |
update: mention long options explicitly in description of merge.update()
stable
|
file |
diff |
annotate
|
| Wed, 18 Oct 2017 22:57:15 +0200 |
Gregory Szorc |
fsmonitor: warn when fsmonitor could be used
|
file |
diff |
annotate
|
| Sun, 15 Oct 2017 20:36:29 -0700 |
Phil Cohen |
context: add workingfilectx.markcopied
|
file |
diff |
annotate
|
| Sun, 15 Oct 2017 20:36:29 -0700 |
Phil Cohen |
merge: don't use workers in in-memory mode
|
file |
diff |
annotate
|