mercurial/merge.py
Thu, 18 May 2017 17:11:24 -0400 Augie Fackler merge: migrate to context manager for changing dirstate parents
Thu, 11 May 2017 18:38:43 -0700 Phil Cohen merge: use repo.wvfs.setflags() instead of util.setflags()
Wed, 03 May 2017 10:43:59 -0700 Durham Goode rebase: use matcher to optimize manifestmerge
Sun, 26 Mar 2017 16:55:56 -0700 Jun Wu merge: use ProgrammingError
Sun, 19 Mar 2017 11:42:17 -0700 Durham Goode merge: remove unnecessary matcher checks
Mon, 13 Mar 2017 21:58:43 -0700 Martin von Zweigbergk merge: also allow 'e' action with experimental.updatecheck=noconflict
Sun, 12 Mar 2017 16:41:46 -0700 Mads Kiilerich merge: check current wc branch for 'nothing to merge', not its p1
Wed, 08 Mar 2017 16:53:32 -0800 Pierre-Yves David merge: directly use repo.vfs.join
Wed, 14 Jan 2015 01:15:26 +0100 Mads Kiilerich merge: use repo.wvfs.unlinkpath
Wed, 14 Jan 2015 01:15:26 +0100 Mads Kiilerich vfs: use repo.wvfs.unlinkpath
Tue, 07 Mar 2017 18:38:20 -0800 Durham Goode merge: remove uses of manifest.matches
Mon, 06 Mar 2017 23:21:27 -0800 Martin von Zweigbergk update: for "noconflict" updates, print "conflicting changes" on conflict
Mon, 13 Feb 2017 00:05:55 -0800 Martin von Zweigbergk update: allow setting default update check to "noconflict"
Mon, 13 Feb 2017 12:58:37 -0800 Martin von Zweigbergk update: accept --merge to allow merging across topo branches (issue5125)
Mon, 27 Feb 2017 15:09:19 -0800 Martin von Zweigbergk merge: combine the "merge" cases in docstring table
Mon, 27 Feb 2017 15:07:01 -0800 Martin von Zweigbergk merge: combine "dirty" cases in docstring table
Mon, 27 Feb 2017 15:29:34 -0800 Martin von Zweigbergk merge: clarify non-linear default updates in docstring table
Mon, 27 Feb 2017 15:02:36 -0800 Martin von Zweigbergk merge: combine the two "can't happen" cases in docstring table
Mon, 27 Feb 2017 15:00:13 -0800 Martin von Zweigbergk merge: move "incompatible options" case first in docstring table
Mon, 27 Feb 2017 14:58:53 -0800 Martin von Zweigbergk merge: make "linear" an input in docstring table
Mon, 27 Feb 2017 14:33:17 -0800 Martin von Zweigbergk merge: drop redundant column in docstring table
Mon, 27 Feb 2017 14:27:22 -0800 Martin von Zweigbergk merge: drop obsolete non-linear cases from docstring table
Thu, 09 Feb 2017 09:52:32 -0800 Martin von Zweigbergk destutil: remove duplicate check and leave it to merge.update()
Thu, 09 Feb 2017 09:55:31 -0800 Martin von Zweigbergk update: fix typo/stale comment to match code
Wed, 08 Feb 2017 23:03:33 -0800 Martin von Zweigbergk merge: remove unused handling of default destination in merge.update()
Wed, 08 Feb 2017 14:49:37 -0800 Martin von Zweigbergk update: localize logic around which ancestor to use
Wed, 01 Feb 2017 02:10:30 +0100 Mads Kiilerich merge: more safe detection of criss cross merge conflict between dm and r stable
Tue, 31 Jan 2017 03:25:59 +0100 Mads Kiilerich merge: fix crash on criss cross merge with dir move and delete (issue5020) stable
Mon, 05 Dec 2016 17:40:01 +0100 Gábor Stefanik graft: support grafting changes to new file in renamed directory (issue5436)
Wed, 23 Nov 2016 00:03:11 +0530 Pulkit Goyal py3: use pycompat.getcwd() instead of os.getcwd()
Mon, 21 Nov 2016 21:52:19 -0500 Augie Fackler mergemod: drop support for merge.update without a target
Thu, 10 Nov 2016 02:21:15 -0800 Durham Goode merge: change modified indicator to be 20 bytes
Thu, 10 Nov 2016 02:19:16 -0800 Durham Goode dirstate: change added/modified placeholder hash length to 20 bytes
Mon, 17 Oct 2016 23:16:55 +0200 Mads Kiilerich spelling: fixes of non-dictionary words
Thu, 25 Aug 2016 22:02:26 +0200 Gábor Stefanik update: enable copy tracing for backwards and non-linear updates
Tue, 04 Oct 2016 04:06:48 -0700 Stanislau Hlebik update: warn if cwd was deleted
Wed, 12 Oct 2016 12:22:18 +0200 Mads Kiilerich merge: clarify warning for (not) merging flags without ancestor
Wed, 12 Oct 2016 12:22:18 +0200 Mads Kiilerich merge: only show "cannot merge flags for %s" warning if flags are different
Sun, 02 Oct 2016 17:31:32 +0900 Yuya Nishihara merge: update doc of manifestmerge() per 18c2184c27dc
Sat, 08 Oct 2016 01:25:28 -0700 Simon Farnsworth merge: use labels in subrepo merge
Tue, 30 Aug 2016 09:22:53 -0700 Martin von Zweigbergk util: rename checkcase() to fscasesensitive() (API)
Tue, 23 Aug 2016 17:58:53 -0700 Siddharth Agarwal merge: remove files with extra actions from merge action list
Fri, 12 Aug 2016 05:56:40 -0700 Simon Farnsworth merge: always use other, not remote, in user prompts
Fri, 12 Aug 2016 06:01:42 -0700 Simon Farnsworth merge: use labels in prompts to the user
Thu, 21 Jul 2016 15:55:47 -0700 Kostia Balytskyi update: fix bug when update tries to modify folder symlink stable
Fri, 01 Jul 2016 17:42:55 +0200 Kostia Balytskyi update: teach hg to override untracked dir with a tracked file on update
Fri, 10 Jun 2016 00:12:33 -0400 Augie Fackler cleanup: replace uses of util.(md5|sha1|sha256|sha512) with hashlib.\1
Thu, 26 May 2016 01:57:34 +0900 FUJIWARA Katsunori merge: make messages translatable
Mon, 16 May 2016 21:30:53 +0000 timeless py3: convert to next() function
Wed, 11 May 2016 09:31:47 +0200 Pierre-Yves David devel: officially deprecate update without destination
Sun, 08 May 2016 10:43:41 +0200 Pierre-Yves David devel: use the new 'config' argument for the update develwarn
Sat, 19 Mar 2016 18:37:10 -0700 Simon Farnsworth merge: save merge part labels for later reuse
Fri, 26 Feb 2016 19:13:10 +0000 Simon Farnsworth merge: fix error message
Tue, 23 Feb 2016 10:59:25 -0800 Martin von Zweigbergk merge: use any() instead of for loop when checking for dirty subrepos
Sat, 20 Feb 2016 15:54:09 -0800 Gregory Szorc merge: perform background file closing in batchget
Sat, 20 Feb 2016 15:27:11 -0800 Gregory Szorc merge: indent code in batchget()
Thu, 11 Feb 2016 17:23:10 -0800 Durham Goode checkunknown: audit path before checking if it's a file or link
Wed, 03 Feb 2016 13:12:06 -0800 Siddharth Agarwal rebase: respect checkunknown and checkignored in more cases
Mon, 01 Feb 2016 20:28:32 -0800 Siddharth Agarwal merge: tell _checkunknownfiles about whether this was merge --force
Mon, 01 Feb 2016 20:28:32 -0800 Siddharth Agarwal merge: add missing doc for 'labels' parameter
less more (0) -300 -100 -60 tip