Mercurial > hg-stable

log mercurial/merge.py @ 38197:aac4be30e250

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -60 tip
age author description
Thu, 17 May 2018 15:25:52 -0700 Martin von Zweigbergk narrow: filter set of files to check for case-folding to core
Thu, 17 May 2018 15:12:48 -0700 Martin von Zweigbergk narrow: filter merge actions in core
Fri, 11 May 2018 00:54:37 -0400 Augie Fackler merge: drop support for using updateresults as tuples (API)
Tue, 19 Jun 2018 22:45:52 +0900 Yuya Nishihara merge: do not fill manifest of committed revision with pseudo node (issue5526) stable
Sat, 14 Apr 2018 18:50:45 -0400 Matt Harbison scmutil: teach the file prefetch hook to handle multiple commits
Thu, 29 Mar 2018 21:29:15 -0700 Martin von Zweigbergk context: avoid using a context object as a changeid
Mon, 05 Mar 2018 00:30:00 -0500 Gregory Szorc merge: deprecate accessing update results by index
Mon, 05 Mar 2018 18:10:36 -0800 Gregory Szorc merge: use constants for actions
Mon, 05 Mar 2018 14:21:57 -0500 Gregory Szorc merge: use constants for merge record state
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)
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: rename conflicts to fileconflicts in _checkunknownfiles
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add _checkunknowndirs function for detecting path conflicts
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: backup conflicting directories when getting files
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add merge action 'pr' to rename files during update
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add merge action 'p' to record path conflicts during update
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add pathconflict merge state
Sun, 08 Oct 2017 21:48:40 +0200 Boris Feld configitems: register 'merge.checkunknown' and 'merge.checkignored'
Fri, 29 Sep 2017 15:48:34 +0000 Alex Gaynor style: never use a space before a colon or comma
Fri, 30 Jun 2017 03:43:13 +0200 Boris Feld configitems: register the 'merge.preferancestor' config
Sat, 30 Sep 2017 15:48:08 +0530 Pulkit Goyal py3: use pycompat.bytestr instead of str
Sat, 30 Sep 2017 15:45:15 +0530 Pulkit Goyal py3: explicitly convert dict.keys() and dict.items() into a list
Thu, 14 Sep 2017 13:14:32 -0700 Phil Cohen merge: allow a custom working context to be passed to update
Tue, 12 Sep 2017 19:27:01 -0700 Phil Cohen merge: move cwd-missing detection to helper functions
Mon, 11 Sep 2017 13:17:43 -0700 Phil Cohen merge: flush any deferred writes just before recordupdates()
Mon, 11 Sep 2017 13:03:27 -0700 Phil Cohen merge: flush any deferred writes before, and after, running any workers
Mon, 11 Sep 2017 13:03:27 -0700 Phil Cohen merge: pass wctx to premerge, filemerge
Thu, 31 Aug 2017 11:28:59 -0700 Phil Cohen merge: move some of the logic in batchget() to workingfilectx
Fri, 14 Jul 2017 19:27:28 +0000 Alex Gaynor merge: removed sorting in casefolding detection, for a slight performance win
Fri, 14 Jul 2017 14:22:40 -0700 Jun Wu codemod: register core configitems using a script
Thu, 06 Jul 2017 16:29:31 -0700 Gregory Szorc sparse: refactor update actions filtering and call from core
Thu, 06 Jul 2017 14:33:18 -0700 Gregory Szorc sparse: move pruning of temporary includes into core
less more | (0) -300 -100 -60 tip