| Fri, 24 Jul 2020 19:48:38 +0530 |
Pulkit Goyal |
mergeresult: introduce action -> (filename, data, msg) mapping and related API
|
| Sun, 02 Aug 2020 10:15:55 -0700 |
Pulkit Goyal |
mergeresult: rename _actions to _filemapping
|
| Fri, 24 Jul 2020 19:19:47 +0530 |
Pulkit Goyal |
sparse: pass mergeresult obj in sparse.filterupdatesactions() (API)
|
| Fri, 24 Jul 2020 19:13:20 +0530 |
Pulkit Goyal |
merge: filter actions before calling _resolvetrivial()
|
| Fri, 24 Jul 2020 18:16:29 +0530 |
Pulkit Goyal |
merge: introduce mergeresult.updateactions() and use it
|
| Fri, 24 Jul 2020 17:57:23 +0530 |
Pulkit Goyal |
merge: pass mergeresult instead of actions in _checkunknownfiles() (API)
|
| Fri, 24 Jul 2020 17:52:33 +0530 |
Pulkit Goyal |
merge: pass mergeresult obj instead of actions dict in _resolvetrivial()
|
| Fri, 24 Jul 2020 17:49:13 +0530 |
Pulkit Goyal |
merge: pass mergeresult obj instead of actions in _filternarrowactions()
|
| Fri, 24 Jul 2020 17:31:26 +0530 |
Pulkit Goyal |
merge: pass mergeresult in checkpassconflicts() instead of actions (API)
|
| Fri, 24 Jul 2020 16:23:55 +0530 |
Pulkit Goyal |
merge: add removefile() to mergeresult object
|
| Fri, 24 Jul 2020 16:18:39 +0530 |
Pulkit Goyal |
merge: introduce mergeresult.addfile() and use it
|
| Fri, 24 Jul 2020 15:56:11 +0530 |
Pulkit Goyal |
merge: make mergeresult constructor initialize empty object
|
| Fri, 24 Jul 2020 15:15:20 +0530 |
Pulkit Goyal |
merge: improve documentation of fbid dict used for merge bid
|
| Fri, 24 Jul 2020 14:45:00 +0530 |
Pulkit Goyal |
merge: move conversion of file-key dict to action-key dict in mergeresult
|
| Sun, 02 Aug 2020 10:12:21 -0700 |
Pulkit Goyal |
merge: introduce hasconflicts() on mergeresult object
|
