| 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'
|
