mercurial/merge.py
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()
less more (0) -300 -100 -50 -30 tip