Mercurial > hg

log mercurial/merge.py @ 35954:386c1e45e671

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -120 tip
age author description
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
Tue, 01 Dec 2015 09:26:33 -0800 Martin von Zweigbergk mergestate: implement unresolvedcount() in terms of unresolved()
Tue, 01 Dec 2015 09:26:10 -0800 Martin von Zweigbergk mergestate: make unresolved() use iteritems()
Tue, 04 Jul 2017 22:35:52 -0700 Phil Cohen workingfilectx: add exists, lexists
Tue, 27 Jun 2017 01:40:34 +0200 Pierre-Yves David obsutil: move 'foreground' to the new modules
Mon, 26 Jun 2017 17:20:46 +0530 Pulkit Goyal py3: use hex() to convert the hash to bytes
Sun, 25 Jun 2017 22:30:14 -0700 Phil Cohen workingfilectx: add audit() as a wrapper for wvfs.audit()
Sun, 25 Jun 2017 22:30:14 -0700 Phil Cohen workingfilectx: add backgroundclose as a kwarg to write()
Sun, 25 Jun 2017 22:29:09 -0700 Phil Cohen merge: change repo.wvfs.setflags calls to a new wctx[f].setflags function
Sun, 25 Jun 2017 17:00:15 -0700 Phil Cohen merge: convert repo.wwrite() calls to wctx[f].write()
Sun, 25 Jun 2017 16:58:26 -0700 Phil Cohen merge: replace repo.wvfs.unlinkpath() with calls to wctx[f].remove()
Sun, 25 Jun 2017 16:56:49 -0700 Phil Cohen merge: pass wctx to batchremove and batchget
Fri, 16 Jun 2017 01:46:47 +0530 Pulkit Goyal py3: replace dict.iterkeys() with iter(dict)
Sat, 03 Jun 2017 19:01:19 +0900 Yuya Nishihara merge: use scmutil.intrev() to sort ctx objects
Thu, 01 Jun 2017 02:14:26 +0530 Pulkit Goyal py3: convert bool variables to bytes before passing into ui.debug()
Wed, 31 May 2017 23:48:52 +0530 Pulkit Goyal py3: replace None with -1 to sort an integer array
Fri, 12 May 2017 16:33:33 -0700 Martin von Zweigbergk merge: use intersectmatchers() in "m2-vs-ma optimization"
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
Mon, 01 Feb 2016 20:28:32 -0800 Siddharth Agarwal merge: move abort/warn checks up to the top level of _checkunknownfiles
Fri, 05 Feb 2016 10:22:14 -0800 Durham Goode merge: add file ancestor linknode to mergestate
Fri, 05 Feb 2016 10:15:28 -0800 Durham Goode merge: add state extras merge state data
Fri, 29 Jan 2016 14:19:29 -0800 Siddharth Agarwal merge: don't try to merge subrepos twice (issue4988) stable
Fri, 15 Jan 2016 13:14:49 -0800 Bryan O'Sullivan with: use context manager in merge update
Tue, 12 Jan 2016 18:38:49 -0800 Siddharth Agarwal merge: split up checks for unknown and ignored files that differ
less more | (0) -120 tip