log mercurial/merge.py @ 27076:09139ccf3085

age author description
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