Mercurial Mercurial > hg / file revisions
summary | shortlog | changelog | graph | tags | bookmarks | branches | file | revisions | annotate | diff | comparison | rss | help
(0) -300 -100 -60 tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
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
Fri, 06 Oct 2017 06:48:43 -0700 Ryan McElroy merge: ensure that we always commit the mergestate file | diff | annotate
Thu, 05 Oct 2017 08:03:57 -0700 Mark Thomas merge: improve comments in mergestate._makerecords file | diff | annotate
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: check for path conflicts when merging (issue5628) file | diff | annotate
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: improve error messages for path conflicts during update file | diff | annotate
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: check for path conflicts when updating (issue5628) file | diff | annotate
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: rename conflicts to fileconflicts in _checkunknownfiles file | diff | annotate
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add _checkunknowndirs function for detecting path conflicts file | diff | annotate
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: backup conflicting directories when getting files file | diff | annotate
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add merge action 'pr' to rename files during update file | diff | annotate
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add merge action 'p' to record path conflicts during update file | diff | annotate
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add pathconflict merge state file | diff | annotate
Sun, 08 Oct 2017 21:48:40 +0200 Boris Feld configitems: register 'merge.checkunknown' and 'merge.checkignored' file | diff | annotate
Fri, 29 Sep 2017 15:48:34 +0000 Alex Gaynor style: never use a space before a colon or comma file | diff | annotate
Fri, 30 Jun 2017 03:43:13 +0200 Boris Feld configitems: register the 'merge.preferancestor' config file | diff | annotate
Sat, 30 Sep 2017 15:48:08 +0530 Pulkit Goyal py3: use pycompat.bytestr instead of str file | diff | annotate
Sat, 30 Sep 2017 15:45:15 +0530 Pulkit Goyal py3: explicitly convert dict.keys() and dict.items() into a list file | diff | annotate
Thu, 14 Sep 2017 13:14:32 -0700 Phil Cohen merge: allow a custom working context to be passed to update file | diff | annotate
Tue, 12 Sep 2017 19:27:01 -0700 Phil Cohen merge: move cwd-missing detection to helper functions file | diff | annotate
Mon, 11 Sep 2017 13:17:43 -0700 Phil Cohen merge: flush any deferred writes just before recordupdates() file | diff | annotate
Mon, 11 Sep 2017 13:03:27 -0700 Phil Cohen merge: flush any deferred writes before, and after, running any workers file | diff | annotate
Mon, 11 Sep 2017 13:03:27 -0700 Phil Cohen merge: pass wctx to premerge, filemerge file | diff | annotate
Thu, 31 Aug 2017 11:28:59 -0700 Phil Cohen merge: move some of the logic in batchget() to workingfilectx file | diff | annotate
Fri, 14 Jul 2017 19:27:28 +0000 Alex Gaynor merge: removed sorting in casefolding detection, for a slight performance win file | diff | annotate
Fri, 14 Jul 2017 14:22:40 -0700 Jun Wu codemod: register core configitems using a script file | diff | annotate
Thu, 06 Jul 2017 16:29:31 -0700 Gregory Szorc sparse: refactor update actions filtering and call from core file | diff | annotate
Thu, 06 Jul 2017 14:33:18 -0700 Gregory Szorc sparse: move pruning of temporary includes into core file | diff | annotate
Tue, 01 Dec 2015 09:26:33 -0800 Martin von Zweigbergk mergestate: implement unresolvedcount() in terms of unresolved() file | diff | annotate
Tue, 01 Dec 2015 09:26:10 -0800 Martin von Zweigbergk mergestate: make unresolved() use iteritems() file | diff | annotate
Tue, 04 Jul 2017 22:35:52 -0700 Phil Cohen workingfilectx: add exists, lexists file | diff | annotate
Tue, 27 Jun 2017 01:40:34 +0200 Pierre-Yves David obsutil: move 'foreground' to the new modules file | diff | annotate
Mon, 26 Jun 2017 17:20:46 +0530 Pulkit Goyal py3: use hex() to convert the hash to bytes file | diff | annotate
Sun, 25 Jun 2017 22:30:14 -0700 Phil Cohen workingfilectx: add audit() as a wrapper for wvfs.audit() file | diff | annotate
Sun, 25 Jun 2017 22:30:14 -0700 Phil Cohen workingfilectx: add backgroundclose as a kwarg to write() file | diff | annotate
Sun, 25 Jun 2017 22:29:09 -0700 Phil Cohen merge: change repo.wvfs.setflags calls to a new wctx[f].setflags function file | diff | annotate
Sun, 25 Jun 2017 17:00:15 -0700 Phil Cohen merge: convert repo.wwrite() calls to wctx[f].write() file | diff | annotate
Sun, 25 Jun 2017 16:58:26 -0700 Phil Cohen merge: replace repo.wvfs.unlinkpath() with calls to wctx[f].remove() file | diff | annotate
Sun, 25 Jun 2017 16:56:49 -0700 Phil Cohen merge: pass wctx to batchremove and batchget file | diff | annotate
Fri, 16 Jun 2017 01:46:47 +0530 Pulkit Goyal py3: replace dict.iterkeys() with iter(dict) file | diff | annotate
Sat, 03 Jun 2017 19:01:19 +0900 Yuya Nishihara merge: use scmutil.intrev() to sort ctx objects file | diff | annotate
Thu, 01 Jun 2017 02:14:26 +0530 Pulkit Goyal py3: convert bool variables to bytes before passing into ui.debug() file | diff | annotate
Wed, 31 May 2017 23:48:52 +0530 Pulkit Goyal py3: replace None with -1 to sort an integer array file | diff | annotate
Fri, 12 May 2017 16:33:33 -0700 Martin von Zweigbergk merge: use intersectmatchers() in "m2-vs-ma optimization" file | diff | annotate
Thu, 18 May 2017 17:11:24 -0400 Augie Fackler merge: migrate to context manager for changing dirstate parents file | diff | annotate
Thu, 11 May 2017 18:38:43 -0700 Phil Cohen merge: use repo.wvfs.setflags() instead of util.setflags() file | diff | annotate
Wed, 03 May 2017 10:43:59 -0700 Durham Goode rebase: use matcher to optimize manifestmerge file | diff | annotate
Sun, 26 Mar 2017 16:55:56 -0700 Jun Wu merge: use ProgrammingError file | diff | annotate
Sun, 19 Mar 2017 11:42:17 -0700 Durham Goode merge: remove unnecessary matcher checks file | diff | annotate
Mon, 13 Mar 2017 21:58:43 -0700 Martin von Zweigbergk merge: also allow 'e' action with experimental.updatecheck=noconflict file | diff | annotate
Sun, 12 Mar 2017 16:41:46 -0700 Mads Kiilerich merge: check current wc branch for 'nothing to merge', not its p1 file | diff | annotate
less more (0) -300 -100 -60 tip
Mercurial