Mercurial: revision graph

graph

less more | rev 45289: (0) -30000 -10000 -3000 -1000 -300 -100 -50 -28 +28 +50 +100 +300 +1000 +3000 tip

merge: filter actions before calling _resolvetrivial()
Fri, 24 Jul 2020 19:13:20 +0530, by Pulkit Goyal
merge: introduce mergeresult.updateactions() and use it
Fri, 24 Jul 2020 18:16:29 +0530, by Pulkit Goyal
merge: pass mergeresult instead of actions in _checkunknownfiles() (API)
Fri, 24 Jul 2020 17:57:23 +0530, by Pulkit Goyal
merge: pass mergeresult obj instead of actions dict in _resolvetrivial()
Fri, 24 Jul 2020 17:52:33 +0530, by Pulkit Goyal
merge: pass mergeresult obj instead of actions in _filternarrowactions()
Fri, 24 Jul 2020 17:49:13 +0530, by Pulkit Goyal
merge: pass mergeresult in checkpassconflicts() instead of actions (API)
Fri, 24 Jul 2020 17:31:26 +0530, by Pulkit Goyal
merge: add removefile() to mergeresult object
Fri, 24 Jul 2020 16:23:55 +0530, by Pulkit Goyal
merge: introduce mergeresult.addfile() and use it
Fri, 24 Jul 2020 16:18:39 +0530, by Pulkit Goyal
merge: make mergeresult constructor initialize empty object
Fri, 24 Jul 2020 15:56:11 +0530, by Pulkit Goyal
merge: improve documentation of fbid dict used for merge bid
Fri, 24 Jul 2020 15:15:20 +0530, by Pulkit Goyal
merge: move conversion of file-key dict to action-key dict in mergeresult
Fri, 24 Jul 2020 14:45:00 +0530, by Pulkit Goyal
merge: introduce hasconflicts() on mergeresult object
Sun, 02 Aug 2020 10:12:21 -0700, by Pulkit Goyal
merge: remove no longer required ACTION_GET_OTHER_AND_STORE
Tue, 14 Jul 2020 16:40:28 +0530, by Pulkit Goyal
merge: pass commitinfo to applyupdates() and get it stored in mergestate
Tue, 14 Jul 2020 16:31:52 +0530, by Pulkit Goyal
merge: introduce 'commitinfo' in mergeresult
Tue, 14 Jul 2020 16:21:08 +0530, by Pulkit Goyal
merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API)
Thu, 23 Jul 2020 18:03:14 +0530, by Pulkit Goyal
Added signature for changeset 7fc3c5fbc65f stable
Mon, 03 Aug 2020 23:13:58 +0530, by Pulkit Goyal
Added tag 5.5 for changeset 7fc3c5fbc65f stable
Mon, 03 Aug 2020 23:13:52 +0530, by Pulkit Goyal
mergestate: fix BC breakage introduced because of removal of a merge record stable 5.5
Sat, 01 Aug 2020 18:39:28 +0530, by Pulkit Goyal
packaging: delete unnecessary updating of `dirs` list
Thu, 30 Jul 2020 22:49:51 -0700, by Martin von Zweigbergk
packaging: make "mercurial.defaultrc" a key in package_data
Sun, 02 Aug 2020 10:08:18 -0700, by Martin von Zweigbergk
templatespec: use new factory functions in hooklib
Thu, 30 Jul 2020 12:22:41 -0700, by Martin von Zweigbergk
templatespec: use new factory functions in logcmdutil
Mon, 20 Jul 2020 22:43:33 -0700, by Martin von Zweigbergk
templatespec: move check for non-unicode to lower-level function
Mon, 20 Jul 2020 21:33:28 -0700, by Martin von Zweigbergk
templatespec: logcmdutil.templatespec() gets either template or mapfile
Mon, 20 Jul 2020 21:32:10 -0700, by Martin von Zweigbergk
templatespec: create a factory function for each type there is
Thu, 16 Jul 2020 13:33:46 -0700, by Martin von Zweigbergk
templater: stop accepting a single style to stylemap()
Wed, 29 Jul 2020 10:42:09 -0700, by Martin von Zweigbergk
formatter: inline a variable assigned from `templater.templater.frommapfile`
Thu, 23 Jul 2020 10:20:48 -0700, by Martin von Zweigbergk

less more | rev 45289: (0) -30000 -10000 -3000 -1000 -300 -100 -50 -28 +28 +50 +100 +300 +1000 +3000 tip