Mercurial > hg
log
age | author | description |
---|---|---|
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() |