mercurial/merge.py
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
Fri, 20 Nov 2015 16:55:01 -0800 Siddharth Agarwal mergestate: add a way to record pending dirstate actions
Sun, 15 Nov 2015 21:55:46 -0800 Siddharth Agarwal merge.recordupdates: don't require action keys to be present in dict
Fri, 20 Nov 2015 11:26:31 -0800 Siddharth Agarwal merge.applyupdates: extend action queues with ones returned from mergestate
Fri, 20 Nov 2015 16:43:25 -0800 Siddharth Agarwal mergestate: add a method to compute actions to perform on dirstate
Fri, 20 Nov 2015 16:37:39 -0800 Siddharth Agarwal merge.applyupdates: use counters from mergestate
Fri, 20 Nov 2015 16:18:51 -0800 Siddharth Agarwal mergestate: add a function to return the number of unresolved files
Fri, 20 Nov 2015 16:17:54 -0800 Siddharth Agarwal mergestate: add a method to return updated/merged/removed counts
Fri, 20 Nov 2015 16:32:47 -0800 Siddharth Agarwal mergestate._resolve: don't return the action any more
Fri, 20 Nov 2015 16:08:22 -0800 Siddharth Agarwal mergestate._resolve: store return code and action for each file
Sat, 14 Nov 2015 00:07:11 -0800 Siddharth Agarwal mergestate.add: store absentfilectxes as nullhex
Fri, 20 Nov 2015 01:14:15 -0800 Siddharth Agarwal mergestate._resolve: handle change/delete conflicts
Thu, 19 Nov 2015 10:50:02 -0800 Siddharth Agarwal merge.mergestate: compute dirstate action
Wed, 18 Nov 2015 14:22:52 -0800 Siddharth Agarwal filemerge: return whether the file was deleted
Wed, 18 Nov 2015 15:46:45 -0800 Siddharth Agarwal mergestate: allow storing and retrieving change/delete conflicts
Wed, 18 Nov 2015 15:46:45 -0800 Siddharth Agarwal mergestate: handle additional record types specially
Wed, 18 Nov 2015 16:39:30 -0800 Siddharth Agarwal mergestate: move binary format documentation into _readrecordsv2
Tue, 17 Nov 2015 14:23:26 -0800 Siddharth Agarwal mergestate.commit: factor out making the list of records
Tue, 17 Nov 2015 14:04:56 -0800 Siddharth Agarwal mergestate: move _read() call to read constructor
Tue, 17 Nov 2015 13:55:30 -0800 Siddharth Agarwal mergestate: add a constructor that reads state from disk
Tue, 17 Nov 2015 17:04:53 -0800 Siddharth Agarwal merge.applyupdates: switch to mergestate.clean()
Tue, 17 Nov 2015 17:00:54 -0800 Siddharth Agarwal mergestate: add a constructor that sets up a clean merge state
Tue, 17 Nov 2015 14:11:52 -0800 Siddharth Agarwal mergestate: raise structured exception for unsupported merge records
Sun, 15 Nov 2015 22:45:20 -0800 Siddharth Agarwal merge.applyupdates: don't return early if merge driver's conclude failed
Fri, 13 Nov 2015 22:43:09 -0800 Siddharth Agarwal merge: make 'cd' and 'dc' actions store the same arguments as 'm'
Fri, 13 Nov 2015 14:24:22 -0800 Siddharth Agarwal merge: stop emptying out 'cd' and 'dc' actions
Thu, 12 Nov 2015 13:14:03 -0800 Martin von Zweigbergk merge: move messages about possible conflicts a litte earlier
Thu, 12 Nov 2015 14:29:02 -0800 Siddharth Agarwal merge.applyupdates: only attempt to merge files in mergeactions
Wed, 04 Nov 2015 23:44:51 -0800 Siddharth Agarwal merge.mergestate: update docstrings for preresolve and resolve
Fri, 23 Oct 2015 06:06:22 -0400 Augie Fackler merge: improve clarity of table in update docstring stable
Thu, 15 Oct 2015 01:22:01 -0700 Siddharth Agarwal merge.applyupdates: call driverconclude after performing merge actions
Thu, 15 Oct 2015 01:19:10 -0700 Siddharth Agarwal merge.applyupdates: call driverpreprocess before starting merge actions
Thu, 15 Oct 2015 01:17:29 -0700 Siddharth Agarwal merge: add stubs for preprocess and conclude steps of merge driver
Thu, 15 Oct 2015 01:06:29 -0700 Siddharth Agarwal merge.mergestate: set merge driver state to 's' if there's none present
Thu, 15 Oct 2015 01:04:46 -0700 Siddharth Agarwal merge.mergestate: only check for merge driver when property is accessed
Thu, 15 Oct 2015 00:57:56 -0700 Siddharth Agarwal merge.mergestate: add a way to get the merge driver state
Thu, 15 Oct 2015 00:49:07 -0700 Siddharth Agarwal merge.mergestate: add a way to get the other side of the merge
Sat, 17 Oct 2015 01:15:34 +0900 FUJIWARA Katsunori merge: make in-memory changes visible to external update hooks
Sat, 17 Oct 2015 01:15:34 +0900 FUJIWARA Katsunori dirstate: make dirstate.write() callers pass transaction object to it
Wed, 14 Oct 2015 15:01:07 -0700 Siddharth Agarwal merge.mergestate: add a generator for driver-resolved files
Mon, 05 Oct 2015 21:42:09 -0700 Pierre-Yves David update: "deprecate" call to 'merge.update' without a destination
Tue, 13 Oct 2015 00:16:25 +0200 Mads Kiilerich merge: abort on file/directory case folding collisions (issue4892)
Wed, 30 Sep 2015 19:43:51 -0700 Siddharth Agarwal merge.mergedriver: don't try resolving files marked driver-resolved
Mon, 28 Sep 2015 18:34:06 -0700 Siddharth Agarwal merge.mergestate: add support for persisting driver-resolved files
Wed, 30 Sep 2015 21:42:52 -0700 Siddharth Agarwal merge.mergestate: add support for persisting a custom merge driver
Tue, 29 Sep 2015 01:03:26 -0700 Pierre-Yves David destupdate: also include bookmark related logic
Sun, 11 Oct 2015 21:56:39 -0700 Siddharth Agarwal merge.mergestate: perform all premerges before any merges (BC)
Sun, 11 Oct 2015 20:12:12 -0700 Siddharth Agarwal merge: introduce a preresolve function
Sun, 11 Oct 2015 18:37:54 -0700 Siddharth Agarwal merge.mergestate._resolve: also return completed status
Sun, 11 Oct 2015 18:29:50 -0700 Siddharth Agarwal merge.mergestate: add a wrapper around resolve
Sun, 11 Oct 2015 20:47:14 -0700 Siddharth Agarwal filemerge: break overall filemerge into separate premerge and merge steps
Sun, 11 Oct 2015 12:56:21 -0700 Siddharth Agarwal filemerge: also return whether the merge is complete
Thu, 08 Oct 2015 12:55:45 -0700 Pierre-Yves David error: get Abort from 'error' instead of 'util'
Mon, 28 Sep 2015 22:11:23 -0700 Pierre-Yves David merge: get the default update destination from the function
Mon, 05 Oct 2015 01:47:33 -0700 Pierre-Yves David merge: drop special parent assignment in the obsolete case
Wed, 30 Sep 2015 21:22:31 -0700 Siddharth Agarwal merge.mergestate: factor out code to validate v1/v2 records
Fri, 25 Sep 2015 00:54:20 -0400 timeless merge: fix mergestate comment
Wed, 19 Aug 2015 14:05:42 -0500 Matt Mackall bidmerge: choose shortest list of diverge and rename/delete warnings
Fri, 18 Sep 2015 17:23:10 -0700 Pierre-Yves David update: move default destination into a revset
Wed, 16 Sep 2015 12:36:21 -0700 Siddharth Agarwal merge: move merge step to the end
Sat, 08 Aug 2015 19:41:25 -0700 Gregory Szorc merge: use absolute_import
Thu, 25 Jun 2015 17:54:55 -0500 Matt Mackall merge: make merge.preferancestor type and default consistent
Thu, 25 Jun 2015 17:53:16 -0500 Matt Mackall merge: mark ancient debugging option
Wed, 08 Jul 2015 17:01:09 +0900 FUJIWARA Katsunori merge: remove useless dirstate.normallookup() invocation in applyupdates()
Tue, 23 Jun 2015 22:20:08 -0700 Gregory Szorc global: mass rewrite to use modern exception syntax
Sat, 16 May 2015 14:34:19 -0400 Augie Fackler cleanup: use __builtins__.all instead of util.all
Wed, 29 Apr 2015 15:52:31 -0400 Matt Harbison merge: run update hook after the last wlock release stable
Sun, 05 Apr 2015 11:55:38 -0700 Durham Goode graft: allow creating sibling grafts
Wed, 25 Mar 2015 13:55:35 +0900 FUJIWARA Katsunori subrepo: add bailifchanged to centralize raising Abort if subrepo is dirty
Fri, 30 Jan 2015 04:59:05 +0900 FUJIWARA Katsunori merge: mark .hgsubstate as possibly dirty before submerge for consistency stable
Sun, 11 Jan 2015 01:51:52 +0100 Angel Ezquerra localrepo: remove all external users of localrepo.wopener
Thu, 15 Jan 2015 23:17:12 +0100 Angel Ezquerra localrepo: remove all external users of localrepo.opener
Thu, 18 Dec 2014 09:22:09 -0800 Martin von Zweigbergk merge: move checking of unknown files out of manifestmerge()
Sat, 13 Dec 2014 23:52:22 -0800 Martin von Zweigbergk merge: extract method for checking for conflicting untracked file
Mon, 15 Dec 2014 16:45:19 -0800 Martin von Zweigbergk merge: create 'cm' action for 'get or merge' case
Fri, 12 Dec 2014 23:18:36 -0800 Martin von Zweigbergk merge: don't overwrite untracked file at directory rename target
Tue, 18 Nov 2014 20:29:25 -0800 Martin von Zweigbergk merge: remove constant tuple element from 'aborts'
Wed, 19 Nov 2014 11:51:31 -0800 Martin von Zweigbergk merge: collect checking for unknown files at end of manifestmerge()
Wed, 19 Nov 2014 11:48:30 -0800 Martin von Zweigbergk merge: introduce 'c' action like 'g', but with additional safety
Wed, 19 Nov 2014 11:44:00 -0800 Martin von Zweigbergk merge: structure 'remote created' code to match table
Thu, 11 Dec 2014 22:07:41 -0800 Martin von Zweigbergk merge: make calculateupdates() return file->action dict
Thu, 11 Dec 2014 21:58:49 -0800 Martin von Zweigbergk merge: let _forgetremoved() work on the file->action dict
Thu, 11 Dec 2014 21:06:16 -0800 Martin von Zweigbergk merge: let _resolvetrivial() work on the file->action dict
Thu, 11 Dec 2014 20:56:53 -0800 Martin von Zweigbergk merge: let bid merge work on the file->action dict
Mon, 08 Dec 2014 13:24:10 -0800 Martin von Zweigbergk merge: write manifestmerge() using dictionary with entry per file
Fri, 14 Nov 2014 05:53:04 -0800 Martin von Zweigbergk merge: perform case-collision checking on final set of actions
Thu, 11 Dec 2014 21:21:21 -0800 Martin von Zweigbergk merge: move cd/dc prompts after largefiles prompts
Wed, 03 Dec 2014 13:50:28 -0800 Martin von Zweigbergk merge: extract _resolvetrivial() function
Tue, 09 Dec 2014 16:49:55 -0800 Martin von Zweigbergk merge: don't treat 'diverge' and 'renamedelete' like actions
Tue, 09 Dec 2014 14:18:31 -0800 Martin von Zweigbergk merge: move dr/rd warning messages out of applyupdates()
Fri, 05 Dec 2014 16:13:26 -0800 Martin von Zweigbergk merge: don't report progress for dr/rd actions
Wed, 03 Dec 2014 14:03:20 -0800 Martin von Zweigbergk merge: make 'keep' message more descriptive
Fri, 05 Dec 2014 12:10:56 -0600 Matt Mackall merge with stable
Wed, 03 Dec 2014 11:02:52 -0800 Martin von Zweigbergk merge: don't overwrite conflicting file in locally renamed directory
less more (0) -120 tip