Mercurial > hg

log mercurial/merge.py @ 44090:2f0a44c69e07

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
Mon, 06 Jan 2020 15:24:36 -0800 Martin von Zweigbergk copies: replace duplicatecopies() by function that takes contexts
Fri, 27 Dec 2019 13:03:40 -0800 Martin von Zweigbergk graft: extract repo[None] to a variable
Mon, 13 Jan 2020 17:15:14 -0500 Augie Fackler core: migrate uses of hashlib.sha1 to hashutil.sha1
Thu, 05 Dec 2019 09:39:49 -0800 Martin von Zweigbergk graft: never set both parents equal in the dirstate (issue6098)
Thu, 05 Dec 2019 09:34:43 -0800 Martin von Zweigbergk graft: extract `repo['.']` to local variable
Thu, 05 Dec 2019 09:32:47 -0800 Martin von Zweigbergk graft: rename `pctx` argument to `base` since that's what it is
Sun, 01 Dec 2019 18:46:10 -0500 Matt Harbison cleanup: fix docstring formatting
Fri, 15 Nov 2019 15:36:09 -0800 Martin von Zweigbergk dirstate: include explicit matches in match.traversedir calls
Thu, 14 Nov 2019 08:03:26 -0800 Martin von Zweigbergk utils: move finddirs() to pathutil
Tue, 05 Nov 2019 08:42:42 -0800 Martin von Zweigbergk py3: don't use bytes with vars() or __dict__ stable
Tue, 08 Oct 2019 15:06:18 -0700 Martin von Zweigbergk cleanup: join string literals that are already on one line
Mon, 07 Oct 2019 00:04:04 -0400 Gregory Szorc py3: finish porting iteritems() to pycompat and remove source transformer
Sun, 06 Oct 2019 17:59:15 -0400 Gregory Szorc py3: define and use pycompat.itervalues()
Sun, 06 Oct 2019 16:58:55 -0400 Gregory Szorc py3: manually import pycompat.delattr where it is needed
Sun, 06 Oct 2019 09:48:39 -0400 Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals
Sun, 06 Oct 2019 09:45:02 -0400 Augie Fackler formatting: blacken the codebase
Wed, 25 Sep 2019 11:04:08 -0400 Augie Fackler merge: check argument value with if/raise instead of an assert
Wed, 25 Sep 2019 10:53:10 -0400 Augie Fackler merge: replace magic strings with NAMED_CONSTANTS (API)
Mon, 23 Sep 2019 21:29:53 +0900 Yuya Nishihara merge with stable
Fri, 20 Sep 2019 23:31:03 +0700 Anton Shestakov merge: back out changeset a4ca0610c754 (parents order when grafting a merge) stable 5.1.2
Thu, 19 Sep 2019 07:50:24 +0900 Yuya Nishihara merge with stable
Wed, 18 Sep 2019 17:53:10 +0700 Anton Shestakov merge: respect parents order when using `graft` on a merge, this time for real stable
Mon, 09 Sep 2019 17:26:17 -0400 Augie Fackler merge with stable
Mon, 09 Sep 2019 17:32:21 +0200 Pierre-Yves David merge: respect parents order when using `graft` on a merge stable
Wed, 21 Aug 2019 13:14:39 -0700 Martin von Zweigbergk merge: hint about using `hg resolve` for resolving conflicts
Thu, 27 Jun 2019 11:39:35 +0200 Valentin Gatien-Baron update: fix spurious unclean status bug shown by previous commit
Mon, 27 May 2019 16:55:46 -0400 Valentin Gatien-Baron merge: fix race that could cause wrong size in dirstate
Tue, 04 Jun 2019 17:24:35 +0800 Anton Shestakov merge: correct argument name in docstring
Sat, 09 Mar 2019 22:13:06 -0800 Martin von Zweigbergk merge: simplify initialization of "pas"
Sat, 09 Mar 2019 22:11:27 -0800 Martin von Zweigbergk merge: reorder some initialization to make more sense
Sun, 14 Apr 2019 00:46:25 -0700 Martin von Zweigbergk merge: remove workaround for issue5020
Fri, 12 Apr 2019 09:41:08 -0700 Martin von Zweigbergk copies: print list of divergent renames in sorted order
Wed, 03 Apr 2019 11:21:27 -0700 Martin von Zweigbergk cleanup: use set literals where possible
Sat, 30 Mar 2019 13:13:10 -0700 Martin von Zweigbergk merge: make "labels" argument to graft() optional, like it is for update()
Wed, 20 Feb 2019 19:28:51 -0500 Augie Fackler cleanup: use () to wrap long lines instead of \
Mon, 04 Feb 2019 21:19:05 -0800 Martin von Zweigbergk merge: migrate to scmutil.backuppath()
Mon, 04 Feb 2019 21:23:44 -0800 Martin von Zweigbergk merge: don't unnecessarily calculate absolute path
Mon, 04 Feb 2019 21:21:55 -0800 Martin von Zweigbergk merge: don't unnecessarily calculate backup path
Thu, 17 Jan 2019 09:17:12 -0800 Martin von Zweigbergk cleanup: delete lots of unused local variables
Tue, 08 Jan 2019 14:19:51 -0800 Daniel Ploch merge: make local file storage in the .hg/merge directory extensible
Sun, 23 Dec 2018 13:16:25 +0530 Sushil khanchi merge: modify the logical statement
Fri, 21 Dec 2018 09:48:30 -0800 Martin von Zweigbergk merge: extract helper for creating empty "actions" dict
Fri, 21 Sep 2018 19:48:23 -0400 Matt Harbison py3: rename pycompat.getcwd() to encoding.getcwd() (API)
Tue, 04 Sep 2018 15:55:23 -0700 Gregory Szorc merge: use vfs methods for I/O
Thu, 06 Sep 2018 18:30:12 -0700 Gregory Szorc merge: move purge logic from extension
Fri, 27 Jul 2018 14:56:10 +0300 Pulkit Goyal merge: do the trivial resolution after updating sparse checkout stable
Wed, 18 Jul 2018 09:49:34 -0700 Gregory Szorc merge: mark file gets as not thread safe (issue5933)
Tue, 29 May 2018 00:26:20 +0200 Boris Feld merge: add a 'keepconflictparent' argument to graft
Thu, 21 Jun 2018 09:32:31 -0700 Martin von Zweigbergk merge with stable
Tue, 19 Jun 2018 22:45:52 +0900 Yuya Nishihara merge: do not fill manifest of committed revision with pseudo node (issue5526) stable
Sun, 17 Jun 2018 22:13:41 -0700 Martin von Zweigbergk progress: hide update(None) in a new complete() method
Fri, 15 Jun 2018 22:37:01 -0700 Martin von Zweigbergk progress: create helper class for incrementing progress
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)
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
less more | (0) -300 -100 -60 tip