log mercurial/merge.py @ 43976:943e34522b37

age author description
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