mercurial/merge.py
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
Tue, 12 Jan 2016 18:17:07 -0800 Siddharth Agarwal merge: determine what untracked conflicts cause warns and aborts separately
Tue, 12 Jan 2016 18:12:35 -0800 Siddharth Agarwal merge: factor out code to get checkunknown config
Sat, 02 Jan 2016 03:11:52 -0800 Siddharth Agarwal merge: add options to warn or ignore on colliding unknown files
Sat, 02 Jan 2016 03:21:01 -0800 Siddharth Agarwal batchget: add support for backing up files
Sat, 02 Jan 2016 03:02:57 -0800 Siddharth Agarwal merge: add a new 'backup' argument to get actions
Sat, 02 Jan 2016 03:02:57 -0800 Siddharth Agarwal _checkunknownfiles: turn 'conflicts' into a set
Sat, 02 Jan 2016 03:02:57 -0800 Siddharth Agarwal checkunknownfiles: make control flow clearer
Sat, 02 Jan 2016 03:02:57 -0800 Siddharth Agarwal _checkunknownfiles: rename 'aborts' to 'conflicts'
Sat, 02 Jan 2016 02:13:56 +0100 Matt Mackall merge with stable
Mon, 28 Dec 2015 22:51:37 -0800 Siddharth Agarwal merge: while checking for unknown files don't follow symlinks (issue5027) stable
Mon, 14 Dec 2015 20:57:21 -0500 Augie Fackler manifestmerge: have manifest do matching before diffing
Mon, 14 Dec 2015 20:47:22 -0500 Augie Fackler merge: rework manifestmerge to use a matcher
Mon, 14 Dec 2015 20:37:41 -0500 Augie Fackler merge: restate calculateupdates in terms of a matcher
Mon, 14 Dec 2015 18:54:03 -0500 Augie Fackler merge: have merge.update use a matcher instead of partial fn
Mon, 07 Dec 2015 20:43:24 -0800 Martin von Zweigbergk merge: refuse update/merge if there are unresolved conflicts (BC)
Thu, 03 Dec 2015 23:01:59 -0500 Andrew Halberstadt merge.graft: add option to keep second parent
Wed, 25 Nov 2015 14:25:33 -0800 Siddharth Agarwal merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Tue, 24 Nov 2015 15:26:51 -0800 Siddharth Agarwal merge.recordupdates: mark 'a' files as added unconditionally
Mon, 30 Nov 2015 10:19:39 -0800 Siddharth Agarwal merge: add a new action type representing files to add/mark as modified
Mon, 30 Nov 2015 10:03:21 -0800 Siddharth Agarwal mergestate: add a cached property accessor for the local context
Mon, 30 Nov 2015 10:05:09 -0800 Siddharth Agarwal mergestate: raise exception if otherctx is accessed but _other isn't set
Mon, 23 Nov 2015 18:03:25 -0800 Siddharth Agarwal mergestate: explicitly forget 'dc' conflicts where the deleted side is picked
Mon, 23 Nov 2015 19:06:15 -0800 Siddharth Agarwal merge.applyupdates: add all actions returned from merge state
Sun, 22 Nov 2015 21:58:28 -0800 Siddharth Agarwal merge.applyupdates: create absentfilectxes for change/delete conflicts
Sun, 22 Nov 2015 21:59:52 -0800 Siddharth Agarwal mergestate: add methods to queue files to remove, add or get
less more (0) -300 -100 -60 tip